From 97c0b72d9dec579e770762bb176ace8caf69ef5c Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 8 Apr 2021 16:57:57 +0200 Subject: [PATCH 01/82] ZooFlow: Admin --- .../Administration/frmAdmin_CWDataSearch.vb | 4 + .../frmAdmin_CWProfile.Designer.vb | 49 +++-- .../Administration/frmAdmin_CWProfile.vb | 4 + .../Administration/frmAdmin_Globix.vb | 4 + .../frmAdmin_IDBAttribute.Designer.vb | 15 +- .../Administration/frmAdmin_IDBAttribute.vb | 18 ++ .../frmAdmin_IDBEntity.Designer.vb | 15 +- .../Administration/frmAdmin_IDBEntity.resx | 3 - .../Administration/frmAdmin_IDBEntity.vb | 18 ++ .../Administration/frmAdmin_Interface.vb | 1 + .../frmAdmin_SourceSQL.Designer.vb | 2 +- .../Administration/frmAdmin_SourceSQL.resx | 3 - .../Administration/frmAdmin_SourceSQL.vb | 18 ++ .../Administration/frmAdmin_Start.Designer.vb | 23 +- GUIs.ZooFlow/Administration/frmAdmin_Start.vb | 198 +++++++----------- GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb | 90 +------- GUIs.ZooFlow/DSIDB_Stammdaten.xsd | 35 +--- .../frmGlobixAdministration.Designer.vb | 1 - .../Globix/frmGlobixAdministration.vb | 4 + GUIs.ZooFlow/My Project/Resources.Designer.vb | 50 +++-- GUIs.ZooFlow/My Project/Resources.resx | 41 ++-- GUIs.ZooFlow/Resources/del.svg | 4 + GUIs.ZooFlow/Resources/del1.svg | 4 + GUIs.ZooFlow/Resources/markcomplete1.svg | 19 ++ GUIs.ZooFlow/ZooFlow.vbproj | 9 + 25 files changed, 319 insertions(+), 313 deletions(-) create mode 100644 GUIs.ZooFlow/Resources/del.svg create mode 100644 GUIs.ZooFlow/Resources/del1.svg create mode 100644 GUIs.ZooFlow/Resources/markcomplete1.svg diff --git a/GUIs.ZooFlow/Administration/frmAdmin_CWDataSearch.vb b/GUIs.ZooFlow/Administration/frmAdmin_CWDataSearch.vb index e6ee211c..b2b02471 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_CWDataSearch.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_CWDataSearch.vb @@ -8,4 +8,8 @@ Public Function SaveData() As Boolean Implements frmAdmin_Interface.SaveData Throw New NotImplementedException() End Function + + Public Function DeleteData() As Boolean Implements frmAdmin_Interface.DeleteData + Throw New NotImplementedException() + End Function End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb index 498ec7b8..8a0c16c3 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb @@ -60,6 +60,7 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem11 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() + Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DBCW_Stammdaten, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBCW_PROFILESBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() @@ -93,9 +94,9 @@ Partial Class frmAdmin_CWProfile ' Me.RibbonControl1.CommandLayout = DevExpress.XtraBars.Ribbon.CommandLayout.Simplified Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.labelStatus, Me.labelError}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.labelStatus, Me.labelError, Me.BarButtonItem3}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 5 + Me.RibbonControl1.MaxItemId = 6 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] @@ -145,6 +146,7 @@ Partial Class frmAdmin_CWProfile ' Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem3) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "RibbonPageGroup1" ' @@ -237,7 +239,7 @@ Partial Class frmAdmin_CWProfile 'txtAddedWho ' Me.txtAddedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "ADDED_WHO", True)) - Me.txtAddedWho.Location = New System.Drawing.Point(145, 246) + Me.txtAddedWho.Location = New System.Drawing.Point(145, 222) Me.txtAddedWho.MenuManager = Me.RibbonControl1 Me.txtAddedWho.Name = "txtAddedWho" Me.txtAddedWho.Size = New System.Drawing.Size(244, 20) @@ -247,7 +249,7 @@ Partial Class frmAdmin_CWProfile 'txtAddedWhen ' Me.txtAddedWhen.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "CHANGED_WHO", True)) - Me.txtAddedWhen.Location = New System.Drawing.Point(534, 246) + Me.txtAddedWhen.Location = New System.Drawing.Point(534, 222) Me.txtAddedWhen.MenuManager = Me.RibbonControl1 Me.txtAddedWhen.Name = "txtAddedWhen" Me.txtAddedWhen.Size = New System.Drawing.Size(246, 20) @@ -257,7 +259,7 @@ Partial Class frmAdmin_CWProfile 'txtChangedWho ' Me.txtChangedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "ADDED_WHEN", True)) - Me.txtChangedWho.Location = New System.Drawing.Point(145, 286) + Me.txtChangedWho.Location = New System.Drawing.Point(145, 262) Me.txtChangedWho.MenuManager = Me.RibbonControl1 Me.txtChangedWho.Name = "txtChangedWho" Me.txtChangedWho.Size = New System.Drawing.Size(244, 20) @@ -267,7 +269,7 @@ Partial Class frmAdmin_CWProfile 'txtChangedWhen ' Me.txtChangedWhen.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "CHANGED_WHEN", True)) - Me.txtChangedWhen.Location = New System.Drawing.Point(534, 286) + Me.txtChangedWhen.Location = New System.Drawing.Point(534, 262) Me.txtChangedWhen.MenuManager = Me.RibbonControl1 Me.txtChangedWhen.Name = "txtChangedWhen" Me.txtChangedWhen.Size = New System.Drawing.Size(246, 20) @@ -300,15 +302,16 @@ Partial Class frmAdmin_CWProfile Me.TextEdit5.Location = New System.Drawing.Point(145, 180) Me.TextEdit5.MenuManager = Me.RibbonControl1 Me.TextEdit5.Name = "TextEdit5" - Me.TextEdit5.Size = New System.Drawing.Size(635, 20) + Me.TextEdit5.Size = New System.Drawing.Size(434, 20) Me.TextEdit5.StyleController = Me.LayoutControl1 Me.TextEdit5.TabIndex = 13 ' 'SimpleButton1 ' - Me.SimpleButton1.Location = New System.Drawing.Point(12, 212) + Me.SimpleButton1.Location = New System.Drawing.Point(599, 180) + Me.SimpleButton1.Margin = New System.Windows.Forms.Padding(10) Me.SimpleButton1.Name = "SimpleButton1" - Me.SimpleButton1.Size = New System.Drawing.Size(776, 22) + Me.SimpleButton1.Size = New System.Drawing.Size(181, 22) Me.SimpleButton1.StyleController = Me.LayoutControl1 Me.SimpleButton1.TabIndex = 14 Me.SimpleButton1.Text = "Regular Expression prüfen" @@ -317,7 +320,7 @@ Partial Class frmAdmin_CWProfile ' Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] Me.Root.GroupBordersVisible = False - Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem2, Me.LayoutControlItem3, Me.LayoutControlItem4, Me.LayoutControlItem6, Me.LayoutControlItem5, Me.LayoutControlItem7, Me.LayoutControlItem10, Me.LayoutControlItem9, Me.LayoutControlItem11, Me.LayoutControlItem8, Me.LayoutControlItem1}) + Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem2, Me.LayoutControlItem3, Me.LayoutControlItem4, Me.LayoutControlItem6, Me.LayoutControlItem5, Me.LayoutControlItem7, Me.LayoutControlItem10, Me.LayoutControlItem9, Me.LayoutControlItem8, Me.LayoutControlItem1, Me.LayoutControlItem11}) Me.Root.Name = "Root" Me.Root.Size = New System.Drawing.Size(800, 362) Me.Root.TextVisible = False @@ -345,7 +348,7 @@ Partial Class frmAdmin_CWProfile 'LayoutControlItem4 ' Me.LayoutControlItem4.Control = Me.txtAddedWho - Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 226) + Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 202) Me.LayoutControlItem4.Name = "LayoutControlItem4" Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem4.Size = New System.Drawing.Size(389, 40) @@ -355,17 +358,17 @@ Partial Class frmAdmin_CWProfile 'LayoutControlItem6 ' Me.LayoutControlItem6.Control = Me.txtChangedWho - Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 266) + Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 242) Me.LayoutControlItem6.Name = "LayoutControlItem6" Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem6.Size = New System.Drawing.Size(389, 76) + Me.LayoutControlItem6.Size = New System.Drawing.Size(389, 100) Me.LayoutControlItem6.Text = "Geändert Wer" Me.LayoutControlItem6.TextSize = New System.Drawing.Size(122, 13) ' 'LayoutControlItem5 ' Me.LayoutControlItem5.Control = Me.txtAddedWhen - Me.LayoutControlItem5.Location = New System.Drawing.Point(389, 226) + Me.LayoutControlItem5.Location = New System.Drawing.Point(389, 202) Me.LayoutControlItem5.Name = "LayoutControlItem5" Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem5.Size = New System.Drawing.Size(391, 40) @@ -375,10 +378,10 @@ Partial Class frmAdmin_CWProfile 'LayoutControlItem7 ' Me.LayoutControlItem7.Control = Me.txtChangedWhen - Me.LayoutControlItem7.Location = New System.Drawing.Point(389, 266) + Me.LayoutControlItem7.Location = New System.Drawing.Point(389, 242) Me.LayoutControlItem7.Name = "LayoutControlItem7" Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem7.Size = New System.Drawing.Size(391, 76) + Me.LayoutControlItem7.Size = New System.Drawing.Size(391, 100) Me.LayoutControlItem7.Text = "Geändert Wann" Me.LayoutControlItem7.TextSize = New System.Drawing.Size(122, 13) ' @@ -388,7 +391,7 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem10.Location = New System.Drawing.Point(0, 160) Me.LayoutControlItem10.Name = "LayoutControlItem10" Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem10.Size = New System.Drawing.Size(780, 40) + Me.LayoutControlItem10.Size = New System.Drawing.Size(579, 42) Me.LayoutControlItem10.Text = "Regular Expression Test" Me.LayoutControlItem10.TextSize = New System.Drawing.Size(122, 13) ' @@ -405,9 +408,10 @@ Partial Class frmAdmin_CWProfile 'LayoutControlItem11 ' Me.LayoutControlItem11.Control = Me.SimpleButton1 - Me.LayoutControlItem11.Location = New System.Drawing.Point(0, 200) + Me.LayoutControlItem11.Location = New System.Drawing.Point(579, 160) Me.LayoutControlItem11.Name = "LayoutControlItem11" - Me.LayoutControlItem11.Size = New System.Drawing.Size(780, 26) + Me.LayoutControlItem11.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem11.Size = New System.Drawing.Size(201, 42) Me.LayoutControlItem11.Text = "Regular Expression prüfen" Me.LayoutControlItem11.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem11.TextVisible = False @@ -432,6 +436,12 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem1.Text = "GUID" Me.LayoutControlItem1.TextSize = New System.Drawing.Size(122, 13) ' + 'BarButtonItem3 + ' + Me.BarButtonItem3.Caption = "Löschen" + Me.BarButtonItem3.Id = 5 + Me.BarButtonItem3.Name = "BarButtonItem3" + ' 'frmAdmin_CWProfile ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -513,4 +523,5 @@ Partial Class frmAdmin_CWProfile Friend WithEvents LayoutControlItem10 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem9 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem11 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb index 81393c08..e02fd74a 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb @@ -73,4 +73,8 @@ Public Class frmAdmin_CWProfile ShowStatus("Attribute gespeichert!") End If End Sub + + Public Function DeleteData() As Boolean Implements frmAdmin_Interface.DeleteData + Throw New NotImplementedException() + End Function End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb b/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb index 0d351c91..a88839d0 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb @@ -78,4 +78,8 @@ Public Class frmAdmin_Globix Private Sub SimpleButton2_Click(sender As Object, e As EventArgs) Handles SimpleButton2.Click End Sub + + Public Function DeleteData() As Boolean Implements frmAdmin_Interface.DeleteData + Throw New NotImplementedException() + End Function End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb index 78fc24cf..5c9a9896 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb @@ -27,6 +27,7 @@ Partial Class frmAdmin_IDBAttribute Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() Me.labelStatus = New DevExpress.XtraBars.BarStaticItem() + Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() @@ -96,9 +97,9 @@ Partial Class frmAdmin_IDBAttribute ' Me.RibbonControl1.CommandLayout = DevExpress.XtraBars.Ribbon.CommandLayout.Simplified Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.labelStatus}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.labelStatus, Me.BarButtonItem3}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 6 + Me.RibbonControl1.MaxItemId = 7 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] @@ -129,6 +130,13 @@ Partial Class frmAdmin_IDBAttribute Me.labelStatus.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph Me.labelStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing ' + 'BarButtonItem3 + ' + Me.BarButtonItem3.Caption = "Löschen" + Me.BarButtonItem3.Id = 6 + Me.BarButtonItem3.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.del1 + Me.BarButtonItem3.Name = "BarButtonItem3" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) @@ -139,6 +147,7 @@ Partial Class frmAdmin_IDBAttribute ' Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem3) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "Daten" ' @@ -443,6 +452,7 @@ Partial Class frmAdmin_IDBAttribute Me.TableAdapterManager.TBIDB_ATTRIBUTE_TYPETableAdapter = Nothing Me.TableAdapterManager.TBIDB_ATTRIBUTETableAdapter = Nothing Me.TableAdapterManager.TBIDB_BUSINESS_ENTITYTableAdapter = Nothing + Me.TableAdapterManager.TBZF_ADMIN_SOURCE_SQLTableAdapter = Nothing Me.TableAdapterManager.UpdateOrder = DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' 'VWIDB_BE_ATTRIBUTETableAdapter @@ -538,4 +548,5 @@ Partial Class frmAdmin_IDBAttribute Friend WithEvents TBIDB_ATTRIBUTE_TYPEBindingSource As BindingSource Friend WithEvents TBIDB_ATTRIBUTE_TYPETableAdapter As DSIDB_StammdatenTableAdapters.TBIDB_ATTRIBUTE_TYPETableAdapter Friend WithEvents ComboBoxEdit1 As DevExpress.XtraEditors.LookUpEdit + Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb index d7a5f62e..d990110b 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb @@ -86,4 +86,22 @@ Public Class frmAdmin_IDBAttribute COMMENT = @COMMENT WHERE (GUID = @GUID)" End Sub + + Public Function DeleteData() As Boolean Implements frmAdmin_Interface.DeleteData + Try + TBIDB_ATTRIBUTE_TYPETableAdapter.Delete(PrimaryKey) + Return True + Catch ex As Exception + ShowError(ex) + Return False + End Try + End Function + + Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick + If MsgBox($"Wollen Sie das Attribut [{PrimaryKey}] wirklich löschen?", MsgBoxStyle.Question Or MsgBoxStyle.YesNo, Text) = MsgBoxResult.Yes Then + If DeleteData() Then + Close() + End If + End If + End Sub End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.Designer.vb index 1324d6a2..d810a618 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.Designer.vb @@ -27,6 +27,7 @@ Partial Class frmAdmin_IDBEntity Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() Me.labelStatus = New DevExpress.XtraBars.BarStaticItem() + Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() @@ -85,9 +86,9 @@ Partial Class frmAdmin_IDBEntity ' Me.RibbonControl1.CommandLayout = DevExpress.XtraBars.Ribbon.CommandLayout.Simplified Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.labelStatus}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.labelStatus, Me.BarButtonItem3}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 4 + Me.RibbonControl1.MaxItemId = 5 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] @@ -119,6 +120,13 @@ Partial Class frmAdmin_IDBEntity Me.labelStatus.Name = "labelStatus" Me.labelStatus.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph ' + 'BarButtonItem3 + ' + Me.BarButtonItem3.Caption = "Löschen" + Me.BarButtonItem3.Id = 4 + Me.BarButtonItem3.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.del + Me.BarButtonItem3.Name = "BarButtonItem3" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) @@ -129,6 +137,7 @@ Partial Class frmAdmin_IDBEntity ' Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem3) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "RibbonPageGroup1" ' @@ -375,6 +384,7 @@ Partial Class frmAdmin_IDBEntity Me.TableAdapterManager.TBIDB_ATTRIBUTE_TYPETableAdapter = Nothing Me.TableAdapterManager.TBIDB_ATTRIBUTETableAdapter = Nothing Me.TableAdapterManager.TBIDB_BUSINESS_ENTITYTableAdapter = Me.TBIDB_BUSINESS_ENTITYTableAdapter + Me.TableAdapterManager.TBZF_ADMIN_SOURCE_SQLTableAdapter = Nothing Me.TableAdapterManager.UpdateOrder = DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' 'frmAdmin_IDBEntity @@ -464,4 +474,5 @@ Partial Class frmAdmin_IDBEntity Friend WithEvents LayoutControlItem8 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem7 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem9 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.resx b/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.resx index 401cbdab..bb650dbd 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.resx +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.resx @@ -123,9 +123,6 @@ 17, 17 - - 17, 17 - 443, 17 diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.vb index c8d7747b..54a57ea0 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.vb @@ -72,4 +72,22 @@ Public Class frmAdmin_IDBEntity Return False End Try End Function + + Public Function DeleteData() As Boolean Implements frmAdmin_Interface.DeleteData + Try + TBIDB_BUSINESS_ENTITYTableAdapter.Delete(PrimaryKey) + Return True + Catch ex As Exception + ShowError(ex) + Return False + End Try + End Function + + Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick + If MsgBox($"Wollen Sie die Entität [{PrimaryKey}] wirklich löschen?", MsgBoxStyle.Question Or MsgBoxStyle.YesNo, Text) = MsgBoxResult.Yes Then + If DeleteData() Then + Close() + End If + End If + End Sub End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Interface.vb b/GUIs.ZooFlow/Administration/frmAdmin_Interface.vb index e37da229..354f8c30 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Interface.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Interface.vb @@ -6,4 +6,5 @@ Public Interface frmAdmin_Interface Property IsInsert As Boolean Function SaveData() As Boolean + Function DeleteData() As Boolean End Interface diff --git a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb index 3b42cd8e..d713b9ad 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb @@ -104,7 +104,7 @@ Partial Class frmAdmin_SourceSQL ' Me.BarButtonItem1.Caption = "Speichern und Schließen" Me.BarButtonItem1.Id = 1 - Me.BarButtonItem1.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_check4 + Me.BarButtonItem1.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.markcomplete1 Me.BarButtonItem1.Name = "BarButtonItem1" ' 'BarButtonItem2 diff --git a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.resx b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.resx index 452569f0..fbbe0e94 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.resx +++ b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.resx @@ -123,9 +123,6 @@ 17, 17 - - 17, 17 - 457, 17 diff --git a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb index 24f5a165..48c452af 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb @@ -39,6 +39,16 @@ End Try End Function + Public Function DeleteData() As Boolean Implements frmAdmin_Interface.DeleteData + Try + TBZF_ADMIN_SOURCE_SQLTableAdapter.Delete(PrimaryKey) + Return True + Catch ex As Exception + ShowError(ex) + Return False + End Try + End Function + 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) @@ -71,4 +81,12 @@ Close() End If End Sub + + Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick + If MsgBox($"Wollen Sie den SourceSQL [{PrimaryKey}] wirklich löschen?", MsgBoxStyle.Question Or MsgBoxStyle.YesNo, Text) = MsgBoxResult.Yes Then + If DeleteData() Then + Close() + End If + End If + End Sub End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb index cff44f8e..3d057911 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb @@ -141,7 +141,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 ' @@ -397,10 +397,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 ' @@ -433,7 +433,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 @@ -464,18 +464,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 @@ -495,6 +495,7 @@ Partial Class frmAdmin_Start Me.TableAdapterManager.TBIDB_ATTRIBUTE_TYPETableAdapter = Nothing Me.TableAdapterManager.TBIDB_ATTRIBUTETableAdapter = Nothing Me.TableAdapterManager.TBIDB_BUSINESS_ENTITYTableAdapter = Nothing + Me.TableAdapterManager.TBZF_ADMIN_SOURCE_SQLTableAdapter = Nothing Me.TableAdapterManager.UpdateOrder = DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' 'TBIDB_ATTRIBUTE_TYPEBindingSource @@ -524,7 +525,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 @@ -727,11 +728,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/Administration/frmAdmin_Start.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb index 44fd4d18..a905feb5 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb @@ -1,5 +1,4 @@ -Imports System.ComponentModel -Imports DevExpress.Utils +Imports DevExpress.Utils Imports DevExpress.XtraBars.Ribbon Imports DevExpress.XtraEditors.Controls Imports DevExpress.XtraEditors.Repository @@ -8,7 +7,6 @@ Imports DevExpress.XtraGrid.Columns Imports DevExpress.XtraGrid.Views.Grid Imports DevExpress.XtraGrid.Views.Grid.ViewInfo Imports DevExpress.XtraTab -Imports DevExpress.XtraTreeList Imports DigitalData.Modules.Logging Public Class frmAdmin_Start @@ -32,31 +30,50 @@ Public Class frmAdmin_Start Private Const PAGE_META_SOURCE_SQL = "META_SOURCE_SQL" Private PrimaryKey As String = Nothing - Private AdminItems As New List(Of AdminItem) + + 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 + }}, + {PAGE_IDB_BUSINESS_ENTITIES, + New AdminNode With { + .Title = "IDB Entitäten", + .[Module] = MODULE_IDB, + .Entity = PAGE_IDB_BUSINESS_ENTITIES + }}, + {PAGE_META_SOURCE_SQL, + New AdminNode With { + .Title = "Source SQL", + .[Module] = MODULE_META, + .Entity = PAGE_META_SOURCE_SQL + }}, + {PAGE_GLOBIX_PROFILES, + New AdminNode With { + .Title = "Global Indexer Profile", + .[Module] = MODULE_GLOBIX, + .Entity = PAGE_GLOBIX_PROFILES + }}, + {PAGE_CW_PROFILES, + New AdminNode With { + .Title = "Clipboard Watcher Profile", + .[Module] = MODULE_CW, + .Entity = PAGE_CW_PROFILES + }} + } Private CurrentModule As String Private CurrentPage As String Private CurrentItem As AdminItem - Private Function IsIDBAttributes(Item As AdminItem) As Boolean - Return Item.Entity = PAGE_IDB_ATTRIBUTES - End Function - - Private Function IsIDBEntities(Item As AdminItem) As Boolean - Return Item.Entity = PAGE_IDB_BUSINESS_ENTITIES - End Function - - Private Function IsCWPRofiles(Item As AdminItem) As Boolean - Return Item.Entity = PAGE_CW_PROFILES - End Function - - Private Function IsGLOBIXProfiles(Item As AdminItem) As Boolean - Return Item.Entity = PAGE_GLOBIX_PROFILES - End Function - - Private Function IsSourceSQL(Item As AdminItem) As Boolean - Return Item.Entity = PAGE_META_SOURCE_SQL - End Function + Private Class AdminNode + Public Property Title As String + Public Property [Module] As String + Public Property Entity As String + End Class Private Class AdminItem Public Property Guid As Integer @@ -73,8 +90,6 @@ Public Class frmAdmin_Start Load_SQLData() TreeListMenu.ExpandAll() - - AddHandler GridControl1.DoubleClick, AddressOf GridControl_DoubleClick End Sub Private Function Load_SQLData() As Boolean @@ -100,7 +115,7 @@ Public Class frmAdmin_Start Logger.Error(ex) End Try - AdminItems.Add(oItem) + AdminItems.Add(oItem.Entity, oItem) Next Return True Catch ex As Exception @@ -109,37 +124,7 @@ Public Class frmAdmin_Start End Try End Function - Sub Display_Tab(pPageToDisplay As XtraTabPage) - Try - If pPageToDisplay.TabControl Is Nothing Then - Exit Sub - End If - - For Each oDocument As XtraTabPage In pPageToDisplay.TabControl.TabPages - If oDocument.Name = pPageToDisplay.Name Then - oDocument.PageVisible = True - Else - oDocument.PageVisible = False - End If - Next - Catch ex As Exception - ShowError(ex) - End Try - End Sub - - Sub Display_RibbonPage(PageToDisplay As RibbonPage) - Try - For Each oPage As RibbonPage In RibbonControl1.Pages - If oPage.Name = PageToDisplay.Name Then - RibbonControl1.SelectedPage = PageToDisplay - End If - Next - Catch ex As Exception - ShowError(ex) - End Try - End Sub - - Private Sub TreeList1_FocusedNodeChanged(sender As Object, e As DevExpress.XtraTreeList.FocusedNodeChangedEventArgs) Handles TreeListMenu.FocusedNodeChanged + 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 Then labelTitle.Text = "Start" @@ -148,47 +133,25 @@ Public Class frmAdmin_Start CurrentPage = e.Node.Tag.ToString - Select Case e.Node.Tag.ToString - Case PAGE_IDB_START - CurrentModule = MODULE_IDB - labelTitle.Text = "IDB Übersicht" - - Case PAGE_IDB_ATTRIBUTES - CurrentModule = MODULE_IDB - labelTitle.Text = "IDB Attribute" - - CurrentItem = AdminItems.Where(AddressOf IsIDBAttributes).FirstOrDefault() - Load_Tree(CurrentItem) - - Case PAGE_IDB_BUSINESS_ENTITIES - CurrentModule = MODULE_IDB - labelTitle.Text = "IDB Entitäten" - CurrentItem = AdminItems.Where(AddressOf IsIDBEntities).FirstOrDefault() - Load_Tree(CurrentItem) - - Case PAGE_GLOBIX_PROFILES - CurrentModule = MODULE_GLOBIX - labelTitle.Text = "Global Indexer Profile" - - CurrentItem = AdminItems.Where(AddressOf IsGLOBIXProfiles).FirstOrDefault() - Load_Tree(CurrentItem) - - Case PAGE_CW_PROFILES - CurrentModule = MODULE_CW - labelTitle.Text = "Clipboard Watcher Profile" - - CurrentItem = AdminItems.Where(AddressOf IsCWPRofiles).FirstOrDefault() - Load_Tree(CurrentItem) - - Case PAGE_META_SOURCE_SQL - CurrentModule = MODULE_META - labelTitle.Text = "Source SQL" - - CurrentItem = AdminItems.Where(AddressOf IsSourceSQL).FirstOrDefault() - Load_Tree(CurrentItem) + If AdminNodes.ContainsKey(CurrentPage) Then + Dim oNode = AdminNodes.Item(CurrentPage) + CurrentModule = oNode.Module + labelTitle.Text = oNode.Title + 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 - End Select + 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 + End If Catch ex As Exception ShowError(ex) End Try @@ -218,7 +181,7 @@ Public Class frmAdmin_Start End With End Sub - Private Sub Load_Tree(Source As AdminItem) + Private Sub Load_GridData(Source As AdminItem) If Source Is Nothing OrElse Source.SQLResult Is Nothing Then Exit Sub End If @@ -281,13 +244,12 @@ Public Class frmAdmin_Start GridView1.BestFitColumns() End Sub - Private Sub GridControl_DoubleClick(sender As Object, e As EventArgs) Handles GridControl1.DoubleClick - Dim oGrid As GridControl = TryCast(sender, GridControl) - Dim oView As GridView = oGrid.MainView - Dim hitInfo As GridHitInfo = oView.CalcHitInfo(TryCast(e, DXMouseEventArgs).Location) - If hitInfo.InRow Then - Try - Dim oRowView As DataRowView = oView.GetFocusedRow + + 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) @@ -308,12 +270,15 @@ Public Class frmAdmin_Start 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 End If - Catch ex As Exception - ShowError(ex) - End Try - End If + End If + Catch ex As Exception + ShowError(ex) + End Try End Sub Private Sub Load_SourceSQL(PrimaryKey As Integer) @@ -323,8 +288,7 @@ Public Class frmAdmin_Start If oForm.HasChanges Then Load_SQLData() - Dim oItem As AdminItem = AdminItems.Where(AddressOf IsSourceSQL).FirstOrDefault - Load_Tree(oItem) + Load_GridData(AdminItems.Item(CurrentPage)) End If Catch ex As Exception ShowError(ex) @@ -338,8 +302,7 @@ Public Class frmAdmin_Start If oForm.HasChanges Then Load_SQLData() - Dim oItem As AdminItem = AdminItems.Where(AddressOf IsIDBAttributes).FirstOrDefault - Load_Tree(oItem) + Load_GridData(AdminItems.Item(CurrentPage)) End If Catch ex As Exception ShowError(ex) @@ -353,8 +316,7 @@ Public Class frmAdmin_Start If oForm.HasChanges Then Load_SQLData() - Dim oItem As AdminItem = AdminItems.Where(AddressOf IsIDBAttributes).FirstOrDefault - Load_Tree(oItem) + Load_GridData(AdminItems.Item(CurrentPage)) End If Catch ex As Exception ShowError(ex) @@ -368,9 +330,7 @@ Public Class frmAdmin_Start If oForm.HasChanges Then Load_SQLData() - - Dim oItem As AdminItem = AdminItems.Where(AddressOf IsCWPRofiles).FirstOrDefault - Load_Tree(oItem) + Load_GridData(AdminItems.Item(CurrentPage)) End If Catch ex As Exception ShowError(ex) @@ -383,9 +343,7 @@ Public Class frmAdmin_Start If oForm.HasChanges Then Load_SQLData() - - Dim oItem As AdminItem = AdminItems.Where(AddressOf IsCWPRofiles).FirstOrDefault - Load_Tree(oItem) + Load_GridData(AdminItems.Item(CurrentPage)) End If Catch ex As Exception ShowError(ex) diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb b/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb index 777f6688..00012dc3 100644 --- a/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb +++ b/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb @@ -5319,35 +5319,9 @@ Namespace DSIDB_StammdatenTableAdapters Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection - Me._adapter.DeleteCommand.CommandText = "DELETE FROM [TBZF_ADMIN_SOURCE_SQL] 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 ((@Is"& _ - "Null_ADDED_WHO = 1 AND [ADDED_WHO] IS NULL) OR ([ADDED_WHO] = @Original_ADDED_WH"& _ - "O)) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @O"& _ - "riginal_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR"& _ - " ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CH"& _ - "ANGED_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)))"& _ - "" + Me._adapter.DeleteCommand.CommandText = "DELETE FROM TBZF_ADMIN_SOURCE_SQL"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID)" Me._adapter.DeleteCommand.CommandType = Global.System.Data.CommandType.Text - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PARENT_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PARENT_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ENTITY_TITLE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ENTITY_TITLE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_SCOPE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SCOPE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PK_COLUMN", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PK_COLUMN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_COMMENT", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_ADDED_WHO", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_ADDED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHO", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_FK_COLUMN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FK_COLUMN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_FK_COLUMN", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FK_COLUMN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.InsertCommand.Connection = Me.Connection Me._adapter.InsertCommand.CommandText = "INSERT INTO [TBZF_ADMIN_SOURCE_SQL] ([PARENT_ID], [ENTITY_TITLE], [SCOPE], [PK_CO"& _ @@ -5497,66 +5471,8 @@ 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.Delete, true)> _ - Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer, ByVal Original_PARENT_ID As Integer, ByVal Original_ENTITY_TITLE As String, ByVal Original_SCOPE As String, ByVal Original_PK_COLUMN As String, ByVal Original_COMMENT As String, ByVal Original_ADDED_WHO As String, ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), ByVal Original_CHANGED_WHO As String, ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date), ByVal Original_FK_COLUMN As String) As Integer + Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer) As Integer Me.Adapter.DeleteCommand.Parameters(0).Value = CType(Original_GUID,Integer) - Me.Adapter.DeleteCommand.Parameters(1).Value = CType(Original_PARENT_ID,Integer) - If (Original_ENTITY_TITLE Is Nothing) Then - Throw New Global.System.ArgumentNullException("Original_ENTITY_TITLE") - Else - Me.Adapter.DeleteCommand.Parameters(2).Value = CType(Original_ENTITY_TITLE,String) - End If - If (Original_SCOPE Is Nothing) Then - Throw New Global.System.ArgumentNullException("Original_SCOPE") - Else - Me.Adapter.DeleteCommand.Parameters(3).Value = CType(Original_SCOPE,String) - End If - If (Original_PK_COLUMN Is Nothing) Then - Throw New Global.System.ArgumentNullException("Original_PK_COLUMN") - Else - Me.Adapter.DeleteCommand.Parameters(4).Value = CType(Original_PK_COLUMN,String) - End If - If (Original_COMMENT Is Nothing) Then - Me.Adapter.DeleteCommand.Parameters(5).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(6).Value = Global.System.DBNull.Value - Else - Me.Adapter.DeleteCommand.Parameters(5).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(6).Value = CType(Original_COMMENT,String) - End If - If (Original_ADDED_WHO Is Nothing) Then - Me.Adapter.DeleteCommand.Parameters(7).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(8).Value = Global.System.DBNull.Value - Else - Me.Adapter.DeleteCommand.Parameters(7).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(8).Value = CType(Original_ADDED_WHO,String) - End If - If (Original_ADDED_WHEN.HasValue = true) Then - Me.Adapter.DeleteCommand.Parameters(9).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(10).Value = CType(Original_ADDED_WHEN.Value,Date) - Else - Me.Adapter.DeleteCommand.Parameters(9).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(10).Value = Global.System.DBNull.Value - End If - If (Original_CHANGED_WHO Is Nothing) Then - Me.Adapter.DeleteCommand.Parameters(11).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(12).Value = Global.System.DBNull.Value - Else - Me.Adapter.DeleteCommand.Parameters(11).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(12).Value = CType(Original_CHANGED_WHO,String) - End If - If (Original_CHANGED_WHEN.HasValue = true) Then - Me.Adapter.DeleteCommand.Parameters(13).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(14).Value = CType(Original_CHANGED_WHEN.Value,Date) - Else - Me.Adapter.DeleteCommand.Parameters(13).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(14).Value = Global.System.DBNull.Value - End If - If (Original_FK_COLUMN Is Nothing) Then - Me.Adapter.DeleteCommand.Parameters(15).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(16).Value = Global.System.DBNull.Value - Else - Me.Adapter.DeleteCommand.Parameters(15).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(16).Value = CType(Original_FK_COLUMN,String) - End If Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.DeleteCommand.Connection.State If ((Me.Adapter.DeleteCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.xsd b/GUIs.ZooFlow/DSIDB_Stammdaten.xsd index 202d9258..c8cf5be7 100644 --- a/GUIs.ZooFlow/DSIDB_Stammdaten.xsd +++ b/GUIs.ZooFlow/DSIDB_Stammdaten.xsd @@ -286,26 +286,11 @@ FROM VWIDB_BE_ATTRIBUTE WHERE ATTR_ID = @ATTRIBUTE_ID AND LANG_ID = @ - - DELETE FROM [TBZF_ADMIN_SOURCE_SQL] 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))) + + DELETE FROM TBZF_ADMIN_SOURCE_SQL +WHERE (GUID = @Original_GUID) - - - - - - - - - - - - - - - - - + @@ -400,7 +385,7 @@ SELECT GUID, PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, AD - + @@ -439,7 +424,7 @@ SELECT GUID, PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, AD - + @@ -496,7 +481,7 @@ SELECT GUID, PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, AD - + @@ -553,7 +538,7 @@ SELECT GUID, PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, AD - + @@ -594,7 +579,7 @@ SELECT GUID, PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, AD - + @@ -685,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/Globix/frmGlobixAdministration.Designer.vb b/GUIs.ZooFlow/Globix/frmGlobixAdministration.Designer.vb index e9792a5a..666e1ece 100644 --- a/GUIs.ZooFlow/Globix/frmGlobixAdministration.Designer.vb +++ b/GUIs.ZooFlow/Globix/frmGlobixAdministration.Designer.vb @@ -820,7 +820,6 @@ Partial Class frmGlobixAdministration ' 'Button1 ' - Me.Button1.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.Datasource_16x16 Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button1.Location = New System.Drawing.Point(12, 85) Me.Button1.Name = "Button1" diff --git a/GUIs.ZooFlow/Globix/frmGlobixAdministration.vb b/GUIs.ZooFlow/Globix/frmGlobixAdministration.vb index 5cc8ea6c..7c8bc544 100644 --- a/GUIs.ZooFlow/Globix/frmGlobixAdministration.vb +++ b/GUIs.ZooFlow/Globix/frmGlobixAdministration.vb @@ -204,4 +204,8 @@ Public Class frmGlobixAdministration RibbonPageGroup1.Text = "Auto Values" End Select End Sub + + Public Function DeleteData() As Boolean Implements frmAdmin_Interface.DeleteData + Throw New NotImplementedException() + End Function End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/My Project/Resources.Designer.vb b/GUIs.ZooFlow/My Project/Resources.Designer.vb index 116d1d46..e5373682 100644 --- a/GUIs.ZooFlow/My Project/Resources.Designer.vb +++ b/GUIs.ZooFlow/My Project/Resources.Designer.vb @@ -330,16 +330,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. - ''' - Friend ReadOnly Property actions_check4() As DevExpress.Utils.Svg.SvgImage - Get - Dim obj As Object = ResourceManager.GetObject("actions_check4", resourceCulture) - Return CType(obj,DevExpress.Utils.Svg.SvgImage) - End Get - End Property - ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -520,16 +510,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - ''' - Friend ReadOnly Property Datasource_16x16() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Datasource_16x16", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -560,6 +540,26 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property del() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("del", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property del1() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("del1", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -670,6 +670,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property markcomplete1() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("markcomplete1", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' diff --git a/GUIs.ZooFlow/My Project/Resources.resx b/GUIs.ZooFlow/My Project/Resources.resx index a992d63b..b642b357 100644 --- a/GUIs.ZooFlow/My Project/Resources.resx +++ b/GUIs.ZooFlow/My Project/Resources.resx @@ -151,11 +151,8 @@ ..\Resources\definednameuseinformula.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\DD_Icons_ICO_PMANAGER_128px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\DD_Icons_ICO_PMANAGER_128px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\about1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -187,9 +184,6 @@ ..\Resources\markcomplete.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\renamedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\actions_check3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -199,12 +193,18 @@ ..\Resources\actions_addcircled3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\markcomplete1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\updatedataextract.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\save1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\del.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\bell_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -244,8 +244,8 @@ ..\Resources\actions_addcircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\about4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\DD_Icons_ICO_PMANAGER_256px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -274,9 +274,6 @@ ..\Resources\doublenext.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\4_GLOBIX_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\actions_addcircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -307,6 +304,9 @@ ..\Resources\3_PERSON_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_edit1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\bo_appearance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -316,8 +316,8 @@ ..\Resources\crossdatasourcefiltering.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_edit1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\4_GLOBIX_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -328,8 +328,8 @@ ..\Resources\3_PERSON_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\renamedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\2_LUPE_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -343,10 +343,13 @@ ..\Resources\4_GLOBIX_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\GLOBIX_short.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\about4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\del1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/del.svg b/GUIs.ZooFlow/Resources/del.svg new file mode 100644 index 00000000..3ac92fc9 --- /dev/null +++ b/GUIs.ZooFlow/Resources/del.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/del1.svg b/GUIs.ZooFlow/Resources/del1.svg new file mode 100644 index 00000000..3ac92fc9 --- /dev/null +++ b/GUIs.ZooFlow/Resources/del1.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/markcomplete1.svg b/GUIs.ZooFlow/Resources/markcomplete1.svg new file mode 100644 index 00000000..6a4b15a1 --- /dev/null +++ b/GUIs.ZooFlow/Resources/markcomplete1.svg @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 3102d875..964ccb76 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -711,6 +711,15 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/GUIs.Test.TestGUI/frmFilesystem.vb b/GUIs.Test.TestGUI/frmFilesystem.vb new file mode 100644 index 00000000..88808638 --- /dev/null +++ b/GUIs.Test.TestGUI/frmFilesystem.vb @@ -0,0 +1,34 @@ +Imports DigitalData.Modules.Logging + +Public Class frmFilesystem + Private LogConfig As LogConfig + Private Filesystem As DigitalData.Modules.Filesystem.File + + Private ShortName As String = "E:\some_test_file.txt" + Private LongName As String = "E:\some_test_file_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more.txt" + + Private Sub frmFilesystem_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Try + LogConfig = New LogConfig(LogConfig.PathType.Temp) + Filesystem = New DigitalData.Modules.Filesystem.File(LogConfig) + + Using oWriter = IO.File.CreateText("E:\some_test_file.txt") + oWriter.WriteLine("bla bla bla") + End Using + + IO.File.Copy(ShortName, LongName) + + Dim oVersion1 = Filesystem.GetVersionedFilename(LongName) + IO.File.Copy(ShortName, oVersion1) + + Dim oVersion2 = Filesystem.GetVersionedFilename(LongName) + IO.File.Copy(ShortName, oVersion2) + Catch ex As Exception + + Finally + IO.File.Delete(ShortName) + IO.File.Delete(LongName) + End Try + + End Sub +End Class \ No newline at end of file diff --git a/GUIs.Test.TestGUI/frmStart.Designer.vb b/GUIs.Test.TestGUI/frmStart.Designer.vb index e029f4b5..796407c1 100644 --- a/GUIs.Test.TestGUI/frmStart.Designer.vb +++ b/GUIs.Test.TestGUI/frmStart.Designer.vb @@ -24,6 +24,7 @@ Partial Class frmStart Private Sub InitializeComponent() Me.Button1 = New System.Windows.Forms.Button() Me.Button2 = New System.Windows.Forms.Button() + Me.Button3 = New System.Windows.Forms.Button() Me.SuspendLayout() ' 'Button1 @@ -44,11 +45,21 @@ Partial Class frmStart Me.Button2.Text = "LookupControl" Me.Button2.UseVisualStyleBackColor = True ' + 'Button3 + ' + Me.Button3.Location = New System.Drawing.Point(12, 134) + Me.Button3.Name = "Button3" + Me.Button3.Size = New System.Drawing.Size(236, 55) + Me.Button3.TabIndex = 0 + Me.Button3.Text = "Filesystem" + Me.Button3.UseVisualStyleBackColor = True + ' 'frmStart ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(800, 450) + Me.Controls.Add(Me.Button3) Me.Controls.Add(Me.Button2) Me.Controls.Add(Me.Button1) Me.Name = "frmStart" @@ -59,4 +70,5 @@ Partial Class frmStart Friend WithEvents Button1 As Button Friend WithEvents Button2 As Button + Friend WithEvents Button3 As Button End Class diff --git a/GUIs.Test.TestGUI/frmStart.vb b/GUIs.Test.TestGUI/frmStart.vb index 67685e1b..693e8e1f 100644 --- a/GUIs.Test.TestGUI/frmStart.vb +++ b/GUIs.Test.TestGUI/frmStart.vb @@ -6,4 +6,8 @@ Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click frmLookup.Show() End Sub + + Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click + frmFilesystem.Show() + End Sub End Class \ No newline at end of file From db8e80dd509434bbc08451cc82e0c93db9414039 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 14 Apr 2021 11:08:30 +0200 Subject: [PATCH 12/82] Filesystem: Cut path in half if too long --- Modules.Filesystem/File.vb | 66 ++++++++++++++++++++++++-------------- 1 file changed, 42 insertions(+), 24 deletions(-) diff --git a/Modules.Filesystem/File.vb b/Modules.Filesystem/File.vb index 344daf4c..e29f65d4 100644 --- a/Modules.Filesystem/File.vb +++ b/Modules.Filesystem/File.vb @@ -23,8 +23,8 @@ Imports DigitalData.Modules.Logging ''' ''' Public Class File - Private ReadOnly _logger As Logger - Private ReadOnly _logConfig As LogConfig + Private ReadOnly _Logger As Logger + Private ReadOnly _LogConfig As LogConfig Private ReadOnly _invalidFilenameChars As String Private ReadOnly _invalidPathChars As String @@ -32,36 +32,42 @@ Public Class File Private Const REGEX_CLEAN_FILENAME As String = "[\\/:""<>|\b\0\r\n\t]" Private Const REGEX_CLEAN_PATH As String = "[:""<>|\b\0\r\n\t]" + ' The limit enforced by windows for filenpaths is 260, + ' so we use a slightly smaller number to have some Error margin. + ' + ' Source: https://docs.microsoft.com/de-de/windows/win32/fileio/naming-a-file?redirectedfrom=MSDN#maximum-path-length-limitation + Private Const MAX_FILE_PATH_LENGTH = 250 + Private Const FILE_NAME_ACCESS_TEST = "accessTest.txt" Public Sub New(LogConfig As LogConfig) - _logConfig = LogConfig - _logger = LogConfig.GetLogger() + _LogConfig = LogConfig + _Logger = LogConfig.GetLogger() _invalidFilenameChars = String.Join("", Path.GetInvalidFileNameChars()) _invalidPathChars = String.Join("", Path.GetInvalidPathChars()) End Sub Public Function GetCleanFilename(FileName As String) As String - _logger.Debug("Filename before cleaning: [{0}]", FileName) + _Logger.Debug("Filename before cleaning: [{0}]", FileName) Dim oCleanName As String = FileName oCleanName = Regex.Replace(oCleanName, _invalidFilenameChars, String.Empty) oCleanName = Regex.Replace(oCleanName, REGEX_CLEAN_FILENAME, String.Empty, RegexOptions.Singleline) - _logger.Debug("Filename after cleaning: [{0}]", oCleanName) + _Logger.Debug("Filename after cleaning: [{0}]", oCleanName) Return oCleanName End Function Public Function GetCleanPath(FilePath As String) As String - _logger.Debug("Path before cleaning: [{0}]", FilePath) + _Logger.Debug("Path before cleaning: [{0}]", FilePath) Dim oCleanName As String = FilePath oCleanName = Regex.Replace(oCleanName, _invalidPathChars, String.Empty) oCleanName = Regex.Replace(oCleanName, REGEX_CLEAN_PATH, String.Empty, RegexOptions.Singleline) - _logger.Debug("Path after cleaning: [{0}]", oCleanName) + _Logger.Debug("Path after cleaning: [{0}]", oCleanName) Return oCleanName End Function @@ -118,20 +124,32 @@ Public Class File oFileVersion = 1 End If + ' Shorten the filename (only filename, without extension or version) + ' by cutting the length in half. This should work no matter how long the path and/or filename are. + If oFileName.Length > MAX_FILE_PATH_LENGTH Then + _Logger.Info("Filename is too long. Filename will be cut to prevent further errors.") + _Logger.Info("Original Filename is: {0}", oFileNameWithoutExtension) + Dim oNewLength As Integer = Math.Round(oFileNameWithoutExtension.Length / 2) + Dim oNewFileNameWithoutExtension = oFileNameWithoutExtension.Substring(0, oNewLength) + _Logger.Info("New Filename will be: {0}", oNewFileNameWithoutExtension) + + oFileNameWithoutExtension = oNewFileNameWithoutExtension + End If + ' while file exists, increment version Do oFinalFileName = Path.Combine(oDestinationDir, GetFilenameWithVersion(oFileNameWithoutExtension, oVersionSeparator, oFileVersion, oExtension)) - _logger.Debug("Intermediate Filename is {0}", oFinalFileName) - _logger.Debug("File version: {0}", oFileVersion) + _Logger.Debug("Intermediate Filename is {0}", oFinalFileName) + _Logger.Debug("File version: {0}", oFileVersion) oFileVersion += 1 Loop While (IO.File.Exists(oFinalFileName)) - _logger.Debug("Final Filename is {0}", oFinalFileName) + _Logger.Debug("Final Filename is {0}", oFinalFileName) Return oFinalFileName Catch ex As Exception - _logger.Warn("Filename {0} could not be versioned. Original filename will be returned!", Destination) - _logger.Error(ex) + _Logger.Warn("Filename {0} could not be versioned. Original filename will be returned!", Destination) + _Logger.Error(ex) Return Destination End Try End Function @@ -177,29 +195,29 @@ Public Class File ToList() If oFiles.Count = 0 Then - _logger.Debug("No files found that match the criterias.") + _Logger.Debug("No files found that match the criterias.") Return True End If - _logger.Debug("Deleting old files (Found {0}).", oFiles.Count) + _Logger.Debug("Deleting old files (Found {0}).", oFiles.Count) For Each oFile As FileInfo In oFiles Try oFile.Delete() Catch ex As Exception If ContinueOnError = False Then - _logger.Warn("Deleting files was aborted at file {0}.", oFile.FullName) + _Logger.Warn("Deleting files was aborted at file {0}.", oFile.FullName) Return False End If oUnableToDeleteCounter = oUnableToDeleteCounter + 1 - _logger.Warn("File {0} could not be deleted!") + _Logger.Warn("File {0} could not be deleted!") End Try Next If oUnableToDeleteCounter > 0 Then - _logger.Debug("Old files partially removed. {0} files could not be removed.", oUnableToDeleteCounter) + _Logger.Debug("Old files partially removed. {0} files could not be removed.", oUnableToDeleteCounter) Else - _logger.Debug("Old files removed.") + _Logger.Debug("Old files removed.") End If Return True @@ -256,27 +274,27 @@ Public Class File Public Function CreateDirectory(DirectoryPath As String, Optional TestWriteAccess As Boolean = True) As String Dim oFinalPath As String If Directory.Exists(DirectoryPath) Then - _logger.Debug("Directory {0} already exists. Skipping.", DirectoryPath) + _Logger.Debug("Directory {0} already exists. Skipping.", DirectoryPath) oFinalPath = DirectoryPath Else Try Directory.CreateDirectory(DirectoryPath) oFinalPath = DirectoryPath Catch ex As Exception - _logger.Error(ex) - _logger.Warn("Directory {0} could not be created. Temp path will be used instead.", DirectoryPath) + _Logger.Error(ex) + _Logger.Warn("Directory {0} could not be created. Temp path will be used instead.", DirectoryPath) oFinalPath = Path.GetTempPath() End Try End If If TestWriteAccess AndAlso Not TestPathIsWritable(DirectoryPath) Then - _logger.Warn("Directory {0} is not writable. Temp path will be used instead.", DirectoryPath) + _Logger.Warn("Directory {0} is not writable. Temp path will be used instead.", DirectoryPath) oFinalPath = Path.GetTempPath() Else oFinalPath = DirectoryPath End If - _logger.Debug("Using path {0}", oFinalPath) + _Logger.Debug("Using path {0}", oFinalPath) Return oFinalPath End Function From ec986a36f2b309911f1661ebf15601ab185e7fd5 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 14 Apr 2021 11:10:54 +0200 Subject: [PATCH 13/82] Filesystem: Version 1.0.3 --- Modules.Filesystem/My Project/AssemblyInfo.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Modules.Filesystem/My Project/AssemblyInfo.vb b/Modules.Filesystem/My Project/AssemblyInfo.vb index c7243660..e0387a3b 100644 --- a/Modules.Filesystem/My Project/AssemblyInfo.vb +++ b/Modules.Filesystem/My Project/AssemblyInfo.vb @@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + From 1c00cb9fc6ff7941b5941c8e44df7b16a55a391e Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 14 Apr 2021 11:12:05 +0200 Subject: [PATCH 14/82] Interfaces: Rename PDFAttachments to PDFEmbeds, also throw zugferd exception when zugferd-invoice.xml could not be parsed --- GUIs.Test.ZUGFeRDTest/Form1.vb | 2 +- Modules.Interfaces/Interfaces.vbproj | 2 +- Modules.Interfaces/ZUGFeRDInterface.vb | 35 +++++++++++++------ .../{PDFAttachments.vb => PDFEmbeds.vb} | 22 ++++++------ .../EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb | 6 ++-- 5 files changed, 41 insertions(+), 26 deletions(-) rename Modules.Interfaces/ZUGFeRDInterface/{PDFAttachments.vb => PDFEmbeds.vb} (91%) diff --git a/GUIs.Test.ZUGFeRDTest/Form1.vb b/GUIs.Test.ZUGFeRDTest/Form1.vb index f1e33f84..00691c15 100644 --- a/GUIs.Test.ZUGFeRDTest/Form1.vb +++ b/GUIs.Test.ZUGFeRDTest/Form1.vb @@ -167,7 +167,7 @@ Public Class Form1 End Sub Private Sub Button7_Click(sender As Object, e As EventArgs) Handles Button7.Click - Dim oExtractor = New PDFAttachments(_logConfig) + Dim oExtractor = New PDFEmbeds(_logConfig) Dim oResult = OpenFileDialog1.ShowDialog() If oResult = DialogResult.OK Then diff --git a/Modules.Interfaces/Interfaces.vbproj b/Modules.Interfaces/Interfaces.vbproj index 4865f507..179500e7 100644 --- a/Modules.Interfaces/Interfaces.vbproj +++ b/Modules.Interfaces/Interfaces.vbproj @@ -112,7 +112,7 @@ - + diff --git a/Modules.Interfaces/ZUGFeRDInterface.vb b/Modules.Interfaces/ZUGFeRDInterface.vb index fa0df194..56297e10 100644 --- a/Modules.Interfaces/ZUGFeRDInterface.vb +++ b/Modules.Interfaces/ZUGFeRDInterface.vb @@ -122,12 +122,21 @@ Public Class ZUGFeRDInterface End Function Public Function ValidateZUGFeRDFileWithGDPicture(Stream As Stream) As XPathDocument - Dim oAttachmentExtractor = New PDFAttachments(_logConfig) + Dim oEmbedExtractor = New PDFEmbeds(_logConfig) Dim oAllowedExtensions = New List(Of String) From {"xml"} Try - Dim oResults = oAttachmentExtractor.Extract(Stream, oAllowedExtensions) - Return HandleAttachments(oResults) + Dim oFiles = oEmbedExtractor.Extract(Stream, oAllowedExtensions) + + ' Attachments are in this case the files that are embedded into a pdf file, + ' like for example the zugferd-invoice.xml file + Return HandleEmbeddedFiles(oFiles) + + Catch ex As ZUGFeRDExecption + ' Don't log ZUGFeRD Exceptions here, they should be handled by the calling code. + ' It also produces misleading error messages when checking if an attachment is a zugferd file. + Throw ex + Catch ex As Exception _logger.Error(ex) Throw ex @@ -135,23 +144,28 @@ Public Class ZUGFeRDInterface End Function Public Function ValidateZUGFeRDFileWithGDPicture(Path As String) As XPathDocument - Dim oAttachmentExtractor = New PDFAttachments(_logConfig) + Dim oEmbedExtractor = New PDFEmbeds(_logConfig) Dim oAllowedExtensions = New List(Of String) From {"xml"} Try - Dim oResults = oAttachmentExtractor.Extract(Path, oAllowedExtensions) - Return HandleAttachments(oResults) + Dim oFiles = oEmbedExtractor.Extract(Path, oAllowedExtensions) + + ' Attachments are in this case the files that are embedded into a pdf file, + ' like for example the zugferd-invoice.xml file + Return HandleEmbeddedFiles(oFiles) + Catch ex As ZUGFeRDExecption ' Don't log ZUGFeRD Exceptions here, they should be handled by the calling code. ' It also produces misleading error messages when checking if an attachment is a zugferd file. Throw ex + Catch ex As Exception _logger.Error(ex) Throw ex End Try End Function - Private Function HandleAttachments(Results As List(Of PDFAttachments.AttachmentResult)) As XPathDocument + Private Function HandleEmbeddedFiles(Results As List(Of PDFEmbeds.EmbeddedFile)) As XPathDocument Dim oXmlDocument As XPathDocument If Results Is Nothing Then @@ -163,10 +177,10 @@ Public Class ZUGFeRDInterface End If Dim oFound As Boolean = False - Dim oFoundResult As PDFAttachments.AttachmentResult = Nothing + Dim oFoundResult As PDFEmbeds.EmbeddedFile = Nothing For Each oResult In Results - If oResult.FileName.ToUpper() = PDFAttachments.ZUGFERD_XML_FILENAME.ToUpper() Then + If oResult.FileName.ToUpper() = PDFEmbeds.ZUGFERD_XML_FILENAME.ToUpper() Then oFound = True oFoundResult = oResult End If @@ -186,9 +200,10 @@ Public Class ZUGFeRDInterface ' Don't log ZUGFeRD Exceptions here, they should be handled by the calling code. ' It also produces misleading error messages when checking if an attachment is a zugferd file. Throw ex + Catch ex As Exception _logger.Error(ex) - Throw ex + Throw New ZUGFeRDExecption(ErrorType.NoValidZugferd, "Datei ist eine ungültige ZUGFeRD Datei.") End Try End Function diff --git a/Modules.Interfaces/ZUGFeRDInterface/PDFAttachments.vb b/Modules.Interfaces/ZUGFeRDInterface/PDFEmbeds.vb similarity index 91% rename from Modules.Interfaces/ZUGFeRDInterface/PDFAttachments.vb rename to Modules.Interfaces/ZUGFeRDInterface/PDFEmbeds.vb index 0e81c1c8..9e82e5ac 100644 --- a/Modules.Interfaces/ZUGFeRDInterface/PDFAttachments.vb +++ b/Modules.Interfaces/ZUGFeRDInterface/PDFEmbeds.vb @@ -3,12 +3,12 @@ Imports System.IO Imports DigitalData.Modules.Logging Imports GdPicture14 -Public Class PDFAttachments +Public Class PDFEmbeds Private ReadOnly Logger As Logger Public Const ZUGFERD_XML_FILENAME = "ZUGFeRD-invoice.xml" - Public Class AttachmentResult + Public Class EmbeddedFile Public FileName As String Public FileContents As Byte() End Class @@ -23,8 +23,8 @@ Public Class PDFAttachments ''' ''' Filepath of the pdf ''' List of allowed extensions to be extracted - Public Function Extract(FilePath As String, AllowedExtensions As List(Of String)) As List(Of AttachmentResult) - Dim oResults As New List(Of AttachmentResult) + Public Function Extract(FilePath As String, AllowedExtensions As List(Of String)) As List(Of EmbeddedFile) + Dim oFile As New List(Of EmbeddedFile) Dim oExtensions = AllowedExtensions.ConvertAll(New Converter(Of String, String)(Function(ext) ext.ToUpper)) Logger.Debug("Extracting embedded files from [{0}]", FilePath) @@ -32,14 +32,14 @@ Public Class PDFAttachments Try Using oGDPicturePDF As New GdPicturePDF() If oGDPicturePDF.LoadFromFile(FilePath, False) = GdPictureStatus.OK Then - oResults = DoExtract(oGDPicturePDF, oExtensions) + oFile = DoExtract(oGDPicturePDF, oExtensions) Else Dim oMessage = String.Format("The file [{0}] can't be loaded. Status: [{1}]", FilePath, oGDPicturePDF.GetStat().ToString()) Throw New ApplicationException(oMessage) End If End Using - Return oResults + Return oFile Catch ex As Exception Logger.Warn("Unexpected Error while Extracting attachments from File [{0}]", FilePath) Logger.Error(ex) @@ -53,8 +53,8 @@ Public Class PDFAttachments ''' ''' Filestream of the pdf ''' List of allowed extensions to be extracted - Public Function Extract(Stream As Stream, AllowedExtensions As List(Of String)) As List(Of AttachmentResult) - Dim oResults As New List(Of AttachmentResult) + Public Function Extract(Stream As Stream, AllowedExtensions As List(Of String)) As List(Of EmbeddedFile) + Dim oResults As New List(Of EmbeddedFile) Dim oExtensions = AllowedExtensions.ConvertAll(New Converter(Of String, String)(Function(ext) ext.ToUpper)) Logger.Debug("Extracting embedded files from stream") @@ -77,8 +77,8 @@ Public Class PDFAttachments End Try End Function - Private Function DoExtract(GDPicturePDF As GdPicturePDF, pExtensions As List(Of String)) As List(Of AttachmentResult) - Dim oResults As New List(Of AttachmentResult) + Private Function DoExtract(GDPicturePDF As GdPicturePDF, pExtensions As List(Of String)) As List(Of EmbeddedFile) + Dim oResults As New List(Of EmbeddedFile) Dim oEmbeddedFileCount As Integer = GDPicturePDF.GetEmbeddedFileCount() If GDPicturePDF.GetStat() = GdPictureStatus.OK Then @@ -104,7 +104,7 @@ Public Class PDFAttachments If oStatus = GdPictureStatus.OK Then Logger.Debug("Embedded file [{0}] extracted sucessfully!", oFileName) - oResults.Add(New AttachmentResult() With { + oResults.Add(New EmbeddedFile() With { .FileContents = oFileData, .FileName = oFileName }) diff --git a/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb b/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb index 8909546c..30105d97 100644 --- a/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb +++ b/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb @@ -124,7 +124,7 @@ Public Class ImportZUGFeRDFiles Public Sub Start(Arguments As Object) Implements IJob.Start Dim oArgs As WorkerArgs = Arguments Dim oPropertyExtractor = New PropertyValues(_logConfig) - Dim oAttachmentExtractor = New PDFAttachments(_logConfig) + Dim oAttachmentExtractor = New PDFEmbeds(_logConfig) _logger.Debug("Starting Job {0}", [GetType].Name) @@ -172,7 +172,7 @@ Public Class ImportZUGFeRDFiles ' Create file lists Dim oFileGroupFiles As List(Of FileInfo) = oFileGroup.Value Dim oEmailAttachmentFiles As New List(Of FileInfo) - Dim oEmbeddedAttachmentFiles As New List(Of PDFAttachments.AttachmentResult) + Dim oEmbeddedAttachmentFiles As New List(Of PDFEmbeds.EmbeddedFile) Dim oMessageId As String = oFileGroup.Key Dim oMissingProperties As New List(Of String) @@ -462,7 +462,7 @@ Public Class ImportZUGFeRDFiles MessageId As String, Files As List(Of FileInfo), AttachmentFiles As List(Of FileInfo), - EmbeddedAttachments As List(Of PDFAttachments.AttachmentResult), + EmbeddedAttachments As List(Of PDFEmbeds.EmbeddedFile), MoveDirectory As String, IsSuccess As Boolean) From 52f2394e6e95397e86ba3435d5362d35089fefaa Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 14 Apr 2021 11:12:34 +0200 Subject: [PATCH 15/82] Interfaces: Version 1.5.2 --- Modules.Interfaces/My Project/AssemblyInfo.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Modules.Interfaces/My Project/AssemblyInfo.vb b/Modules.Interfaces/My Project/AssemblyInfo.vb index 14a07d11..153825e9 100644 --- a/Modules.Interfaces/My Project/AssemblyInfo.vb +++ b/Modules.Interfaces/My Project/AssemblyInfo.vb @@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + From 37609ee918260dc69de19be8b12f45e2fad2474d Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 15 Apr 2021 11:13:46 +0200 Subject: [PATCH 16/82] Database: Add Support for MSSQL Transactions BREAKING CHANGE: Rename GetScalarValueConStr and ExecuteNonQueryCS --- Modules.Database/MSSQLServer.vb | 381 ++++++++++++++++---------------- 1 file changed, 185 insertions(+), 196 deletions(-) diff --git a/Modules.Database/MSSQLServer.vb b/Modules.Database/MSSQLServer.vb index 59f22200..0d850307 100644 --- a/Modules.Database/MSSQLServer.vb +++ b/Modules.Database/MSSQLServer.vb @@ -1,4 +1,5 @@ -Imports System.Data.Common +Imports System.ComponentModel +Imports System.Data.Common Imports System.Data.SqlClient Imports DigitalData.Modules.Logging @@ -8,9 +9,21 @@ Public Class MSSQLServer Public DBInitialized As Boolean = False Public CurrentSQLConnectionString As String = "" + Public Const TIMEOUT_DEFAULT As Integer = 120 + Public Const TABLE_DEFAULT As String = "DDRESULT" + Private ReadOnly _Timeout As Integer Private ReadOnly _Logger As Logger + Public Enum TransactionMode + + NoTransaction + + ExternalTransaction + + WithTransaction + End Enum + Public Sub New(LogConfig As LogConfig, ConnectionString As String, Optional Timeout As Integer = 120) _Logger = LogConfig.GetLogger() _Timeout = Timeout @@ -49,6 +62,36 @@ Public Class MSSQLServer Return oConnectionStringBuilder.ToString End Function + + Private Function MaybeGetTransaction(Connection As SqlConnection, Mode As TransactionMode, Transaction As SqlTransaction) As SqlTransaction + If Mode = TransactionMode.NoTransaction Then + Return Nothing + ElseIf Mode = TransactionMode.ExternalTransaction Then + Return Transaction + Else + Return Connection.BeginTransaction() + End If + End Function + + Private Function MaybeCommitTransaction(Transaction As SqlTransaction, TransactionMode As TransactionMode) As Boolean + Select Case TransactionMode + Case TransactionMode.NoTransaction + Return True + Case TransactionMode.ExternalTransaction + Return True + Case TransactionMode.WithTransaction + Try + Transaction.Commit() + Return True + Catch ex As Exception + _Logger.Error(ex) + Return False + End Try + Case Else + Return True + End Select + End Function + Public Function Get_ConnectionStringforID(pConnectionId As Integer) Dim connectionString As String = "" Try @@ -94,7 +137,7 @@ Public Class MSSQLServer Private Function TestCanConnect(ConnectionString As String) As Boolean Try - _Logger.Debug("Testing connection to [{0}]", ConnectionString) + _Logger.Debug("Testing connection to [{0}]", MaskConnectionString(ConnectionString)) Dim oConnection As New SqlConnection(ConnectionString) oConnection.Open() oConnection.Close() @@ -105,11 +148,28 @@ Public Class MSSQLServer End Try End Function + Private Function TestCanConnect(Connection As SqlConnection) As Boolean + Try + If Connection Is Nothing Then + _Logger.Warn("TestCanConnect: Connection is nothing!") + Return False + End If + + _Logger.Debug("Testing connection to [{0}]", MaskConnectionString(Connection.ConnectionString)) + Connection.Open() + Connection.Close() + Return True + Catch ex As Exception + _Logger.Error(ex) + Return False + End Try + End Function + Private Function GetSQLConnection() As SqlConnection - Return GetSQLConnection(CurrentSQLConnectionString) + Return GetConnection(CurrentSQLConnectionString) End Function - Private Function GetSQLConnection(ConnectionString As String) As SqlConnection + Private Function GetConnection(ConnectionString As String) As SqlConnection Try Dim oConnection As New SqlConnection(ConnectionString) oConnection.Open() @@ -136,233 +196,186 @@ Public Class MSSQLServer End Try End Function + Public Function GetDatatable(SqlCommand As String) As DataTable Implements IDatabase.GetDatatable + Return GetDatatable(SqlCommand, _Timeout) + End Function + ''' ''' Returns a datatable for a sql-statement ''' ''' sqlcommand for datatable (select XYZ from TableORView) ''' Returns a datatable Public Function GetDatatable(SqlCommand As String, Timeout As Integer) As DataTable Implements IDatabase.GetDatatable - Try - If TestCanConnect() = False Then - Return Nothing - End If - - _Logger.Debug("GetDatatable: Running Query [{0}]", SqlCommand) - - Using oConnection = GetSQLConnection() - Using oSQLCOmmand = oConnection.CreateCommand() - oSQLCOmmand.CommandText = SqlCommand - oSQLCOmmand.CommandTimeout = Timeout - - Dim dt As DataTable = New DataTable() - Dim oAdapter As SqlDataAdapter = New SqlDataAdapter(oSQLCOmmand) - oAdapter.Fill(dt) - Return dt - End Using - End Using - Catch ex As Exception - _Logger.Error(ex) - _Logger.Warn($"GetDatatable failed SQLCommand [{SqlCommand}]") - Return Nothing - End Try + Using oSqlConnection = GetSQLConnection() + Return GetDatatableWithConnectionObject(SqlCommand, oSqlConnection, TransactionMode.WithTransaction, Nothing, Timeout) + End Using End Function - Public Function GetDatatable(SqlCommand As String) As DataTable Implements IDatabase.GetDatatable - Return GetDatatable(SqlCommand, _Timeout) + Public Function GetDatatable(SqlCommand As String, Transaction As SqlTransaction) As DataTable + Using oSqlConnection = GetSQLConnection() + Return GetDatatableWithConnectionObject(SqlCommand, oSqlConnection, TransactionMode.ExternalTransaction, Transaction) + End Using End Function + Public Async Function GetDatatableAsync(SqlCommand As String) As Task(Of DataTable) - Return Await Task.Run(Function() - Return GetDatatable(SqlCommand, _Timeout) - End Function) + Return Await Task.Run(Function() GetDatatable(SqlCommand, _Timeout)) End Function Public Function GetDatatableWithConnection(SqlCommand As String, ConnectionString As String) As DataTable - Try - If TestCanConnect(ConnectionString) = False Then - Return Nothing - End If - - _Logger.Debug("GetDatatableWithConnection: Running Query [{0}]", SqlCommand) - - Using oConnection = GetSQLConnection(ConnectionString) - Using oSQLCOmmand = oConnection.CreateCommand() - oSQLCOmmand.CommandText = SqlCommand - oSQLCOmmand.CommandTimeout = _Timeout + Using oConnection = GetConnection(ConnectionString) + Return GetDatatableWithConnectionObject(SqlCommand, oConnection) + End Using + End Function - Dim dt As DataTable = New DataTable() - Dim oAdapter As SqlDataAdapter = New SqlDataAdapter(oSQLCOmmand) - oAdapter.Fill(dt) - Return dt - End Using - End Using - Catch ex As Exception - _Logger.Error(ex) - _Logger.Warn($"GetDatatableWithConnection failed with SQLCommand [{SqlCommand}] and ConnectionString [{MaskConnectionString(ConnectionString)}]") + Public Function GetDatatableWithConnectionObject(SqlCommand As String, SqlConnection As SqlConnection, + Optional TransactionMode As TransactionMode = TransactionMode.WithTransaction, + Optional Transaction As SqlTransaction = Nothing, + Optional Timeout As Integer = 120) As DataTable + If TestCanConnect(SqlConnection) = False Then Return Nothing - End Try - End Function + End If + + Dim oTransaction As SqlTransaction = MaybeGetTransaction(SqlConnection, TransactionMode, Transaction) + Dim oTable As New DataTable() With {.TableName = TABLE_DEFAULT} - Public Function GetDatatableWithConnection2(SqlCommand As String, ConnectionString As String) As DataTable Try - If TestCanConnect(ConnectionString) = False Then - Return Nothing - End If + Dim oAdapter As New SqlDataAdapter(New SqlCommand With { + .CommandText = SqlCommand, + .Connection = SqlConnection, + .Transaction = oTransaction, + .CommandTimeout = Timeout + }) - _Logger.Debug("GetDatatableWithConnection2: Running Query [{0}]", SqlCommand) + _Logger.Debug("GetDatatableWithConnectionObject: Running Query [{0}]", SqlCommand) - Using oConnection = GetSQLConnection(ConnectionString) - Using oSQLCOmmand = oConnection.CreateCommand() - oSQLCOmmand.CommandText = SqlCommand - oSQLCOmmand.CommandTimeout = _Timeout + oAdapter.Fill(oTable) - Dim oTable As DataTable = New DataTable("DD_RESULT") + _Logger.Debug("GetDatatableWithConnectionObject: Running Query [{0}]", SqlCommand) + Catch ex As Exception + _Logger.Error(ex) + _Logger.Warn("GetDatatableWithConnectionObject: Error in GetDatatableWithConnection while executing command: [{0}]", SqlCommand) + Throw ex + Finally + MaybeCommitTransaction(oTransaction, TransactionMode) + End Try - Using oReader As SqlDataReader = oSQLCOmmand.ExecuteReader() - Dim oSchemaTable As DataTable = oReader.GetSchemaTable() + Return oTable + End Function - For Each oRow As DataRow In oSchemaTable.Rows - Dim oDataColumn As New DataColumn - oDataColumn.ColumnName = oRow("ColumnName").ToString() - oDataColumn.DataType = Type.GetType(oRow("DataType").ToString()) - oTable.Columns.Add(oDataColumn) - Next + Public Function ExecuteNonQuery(SQLCommand As String) As Boolean Implements IDatabase.ExecuteNonQuery + Using oConnection = GetSQLConnection() + Return ExecuteNonQueryWithConnectionObject(SQLCommand, oConnection, TransactionMode.WithTransaction, Nothing, TIMEOUT_DEFAULT) + End Using + End Function - While (oReader.Read()) - Dim oRow As DataRow = oTable.NewRow() + Public Function ExecuteNonQuery(SQLCommand As String, Timeout As Integer) As Boolean Implements IDatabase.ExecuteNonQuery + Using oConnection = GetSQLConnection() + Return ExecuteNonQueryWithConnectionObject(SQLCommand, oConnection, TransactionMode.WithTransaction, Nothing, TIMEOUT_DEFAULT) + End Using + End Function - For index = 0 To oTable.Columns.Count - 1 - oRow.Item(index) = oReader.Item(index) - Next - oTable.Rows.Add(oRow) - End While + Public Function ExecuteNonQuery(SQLCommand As String, Transaction As SqlTransaction) As Boolean + Using oConnection = GetSQLConnection() + Return ExecuteNonQueryWithConnectionObject(SQLCommand, oConnection, TransactionMode.ExternalTransaction, Transaction, TIMEOUT_DEFAULT) + End Using + End Function - Return oTable - End Using - End Using - End Using - Catch ex As Exception - _Logger.Error(ex) - _Logger.Warn($"GetDatatableWithConnection2 failed SQLCommand [{SqlCommand}]") + Public Async Function ExecuteNonQueryAsync(SQLCommand As String) As Task(Of Boolean) + Return Await Task.Run(Function() ExecuteNonQuery(SQLCommand)) + End Function - Return Nothing - End Try + Public Function ExecuteNonQueryWithConnection(pSQLCommand As String, ConnString As String) As Boolean + Using oConnection = GetConnection(ConnString) + Return ExecuteNonQueryWithConnectionObject(pSQLCommand, oConnection) + End Using End Function - Public Function ExecuteNonQuery(SQLCommand As String, Timeout As Integer) As Boolean Implements IDatabase.ExecuteNonQuery - Try - If TestCanConnect() = False Then - Return Nothing - End If + Public Function ExecuteNonQueryWithConnectionObject(SqlCommand As String, SqlConnection As SqlConnection, + Optional TransactionMode As TransactionMode = TransactionMode.WithTransaction, + Optional Transaction As SqlTransaction = Nothing, + Optional Timeout As Integer = 120) As Boolean + If TestCanConnect(SqlConnection) = False Then + Return False + End If - _Logger.Debug("ExecuteNonQuery: Running Query [{0}]", SQLCommand) + Dim oTransaction As SqlTransaction = MaybeGetTransaction(SqlConnection, TransactionMode, Transaction) - Using oConnection = GetSQLConnection() - Using oSQLCOmmand = oConnection.CreateCommand() - oSQLCOmmand.CommandText = SQLCommand - oSQLCOmmand.CommandTimeout = Timeout - oSQLCOmmand.ExecuteNonQuery() - Return True - End Using + Try + Using oSQLCOmmand = SqlConnection.CreateCommand() + oSQLCOmmand.CommandText = SqlCommand + oSQLCOmmand.CommandTimeout = Timeout + oSQLCOmmand.Transaction = oTransaction + oSQLCOmmand.ExecuteNonQuery() End Using - Catch ex As Exception - _Logger.Error(ex) - _Logger.Warn($"ExecuteNonQuery failed SQLCommand [{SQLCommand}]") - Return False - End Try - End Function - Public Function ExecuteNonQueryCS(pSQLCommand As String, ConnString As String, Optional pInfo As String = "") - Try - If pInfo <> "" Then - pInfo = "[" & pInfo & "]" - End If - Dim SQLconnect As New SqlClient.SqlConnection - Dim SQLcommand As SqlClient.SqlCommand - SQLconnect.ConnectionString = ConnString - SQLconnect.Open() - SQLcommand = SQLconnect.CreateCommand - 'Update Last Created Record in Foo - SQLcommand.CommandText = pSQLCommand - _Logger.Debug("Execute_non_Query_ConStr Created: " & pSQLCommand) - SQLcommand.ExecuteNonQuery() - SQLcommand.Dispose() - SQLconnect.Close() Return True Catch ex As Exception _Logger.Error(ex) - _Logger.Warn($"ExecuteNonQueryCS failed SQLCommand [{pSQLCommand}]") - + _Logger.Warn("GetDatatableWithConnectionObject: Error in GetDatatableWithConnection while executing command: [{0}]", SqlCommand) Return False + Finally + MaybeCommitTransaction(oTransaction, TransactionMode) End Try End Function - Public Function ExecuteNonQuery(SQLCommand As String) As Boolean Implements IDatabase.ExecuteNonQuery - Return ExecuteNonQuery(SQLCommand, _Timeout) - End Function - Public Async Function ExecuteNonQueryAsync(SQLCommand As String) As Task(Of Boolean) - Return Await Task.Run(Function() - Return ExecuteNonQuery(SQLCommand, _Timeout) - End Function) + Public Function GetScalarValue(SQLQuery As String) As Object Implements IDatabase.GetScalarValue + Using oConnection = GetSQLConnection() + Return GetScalarValueWithConnectionObject(SQLQuery, oConnection) + End Using End Function Public Function GetScalarValue(SQLCommand As String, Timeout As Integer) As Object Implements IDatabase.GetScalarValue - Try - If TestCanConnect() = False Then - Return Nothing - End If - - _Logger.Debug("GetScalarValue: Running Query [{0}]", SQLCommand) - - Using oConnection As SqlConnection = GetSQLConnection() - Using oSQLCOmmand = oConnection.CreateCommand() - oSQLCOmmand.CommandText = SQLCommand - oSQLCOmmand.CommandTimeout = Timeout - Dim oResult As Object = oSQLCOmmand.ExecuteScalar() - Return oResult - End Using - End Using - Catch ex As Exception - _Logger.Error(ex) - _Logger.Warn($"GetScalarValue failed SQLCommand [{SQLCommand}]") - - Return Nothing - End Try + Using oConnection = GetSQLConnection() + Return GetScalarValueWithConnectionObject(SQLCommand, oConnection, TransactionMode.WithTransaction, Nothing, Timeout) + End Using End Function - Public Function GetScalarValue(SQLQuery As String) As Object Implements IDatabase.GetScalarValue - Return GetScalarValue(SQLQuery, _Timeout) + Public Function GetScalarValue(SQLCommand As String, Transaction As SqlTransaction) As Object + Using oConnection = GetSQLConnection() + Return GetScalarValueWithConnectionObject(SQLCommand, oConnection, TransactionMode.ExternalTransaction, Transaction) + End Using End Function Public Async Function GetScalarValueAsync(SQLQuery As String) As Task(Of Object) - Return Await Task.Run(Function() - Return GetScalarValue(SQLQuery, _Timeout) - End Function) + Return Await Task.Run(Function() GetScalarValue(SQLQuery, _Timeout)) End Function Public Function GetScalarValueWithConnection(SQLCommand As String, ConnectionString As String) As Object - Try - If TestCanConnect(ConnectionString) = False Then - Return Nothing - End If + Using oConnection = GetConnection(ConnectionString) + Return GetScalarValueWithConnectionObject(SQLCommand, oConnection) + End Using + End Function - _Logger.Debug("GetScalarValue: Running Query [{0}]", SQLCommand) + Public Function GetScalarValueWithConnectionObject(SqlCommand As String, SqlConnection As SqlConnection, + Optional TransactionMode As TransactionMode = TransactionMode.WithTransaction, + Optional Transaction As SqlTransaction = Nothing, + Optional Timeout As Integer = 120) As Object + If TestCanConnect() = False Then + Return Nothing + End If - Using oConnection As SqlConnection = GetSQLConnection(ConnectionString) - Using oSQLCOmmand = oConnection.CreateCommand() - oSQLCOmmand.CommandText = SQLCommand - oSQLCOmmand.CommandTimeout = _Timeout - Dim oResult As Object = oSQLCOmmand.ExecuteScalar() - Return oResult - End Using + Dim oTransaction As SqlTransaction = MaybeGetTransaction(SqlConnection, TransactionMode, Transaction) + Dim oResult As Object = Nothing + + Try + Using oSQLCOmmand = SqlConnection.CreateCommand() + oSQLCOmmand.CommandText = SqlCommand + oSQLCOmmand.CommandTimeout = Timeout + oSQLCOmmand.Transaction = oTransaction + + oResult = oSQLCOmmand.ExecuteScalar() End Using Catch ex As Exception _Logger.Error(ex) - _Logger.Warn($"GetScalarValueWithConnection failed SQLCommand [{SQLCommand}]") - Return Nothing + _Logger.Warn("GetDatatableWithConnectionObject: Error in GetDatatableWithConnection while executing command: [{0}]", SqlCommand) + Finally + MaybeCommitTransaction(oTransaction, TransactionMode) End Try + + Return oResult End Function Public Function GetScalarValue(SQLCommand As SqlCommand, OutputParameter As String, Timeout As Integer) As Object @@ -396,30 +409,6 @@ Public Class MSSQLServer Return Nothing End Try End Function - Public Function GetScalarValueConStr(pSQLCommand As String, ConString As String, Optional pInfo As String = "") - Dim result - Try - If pInfo <> "" Then - pInfo = "[" & pInfo & "]" - End If - Dim SQLconnect As New SqlClient.SqlConnection - Dim SQLcommand As SqlClient.SqlCommand - SQLconnect.ConnectionString = ConString - SQLconnect.Open() - SQLcommand = SQLconnect.CreateCommand - 'Update Last Created Record in Foo - SQLcommand.CommandText = pSQLCommand - _Logger.Debug("Execute_Scalar_ConStr Scalar: " & pSQLCommand) - result = SQLcommand.ExecuteScalar() - SQLcommand.Dispose() - SQLconnect.Close() - Return result - Catch ex As Exception - _Logger.Error(ex) - _Logger.Warn($"GetScalarValueConStr failed SQLCommand [{pSQLCommand}]") - Return Nothing - End Try - End Function Public Function GetScalarValue(SQLCommand As SqlCommand, OutputParameter As String) As Object Return GetScalarValue(SQLCommand, OutputParameter, _Timeout) From 2b3e56dca784a3f889fec5a2419896605ec7dfe2 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 15 Apr 2021 11:13:57 +0200 Subject: [PATCH 17/82] Database: Version 2.0.0 --- Modules.Database/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules.Database/My Project/AssemblyInfo.vb b/Modules.Database/My Project/AssemblyInfo.vb index 6de0b4b6..aaad80c1 100644 --- a/Modules.Database/My Project/AssemblyInfo.vb +++ b/Modules.Database/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + From 9b0527d601bdcb4e2a78531eb778cee9c0f9c9e5 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 15 Apr 2021 11:14:28 +0200 Subject: [PATCH 18/82] TestGUI: update --- GUIs.Test.TestGUI/App.config | 20 ++++++++++---------- GUIs.Test.TestGUI/TestGUI.vbproj | 4 ++-- GUIs.Test.TestGUI/packages.config | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/GUIs.Test.TestGUI/App.config b/GUIs.Test.TestGUI/App.config index 901f8a79..d0f7e844 100644 --- a/GUIs.Test.TestGUI/App.config +++ b/GUIs.Test.TestGUI/App.config @@ -1,35 +1,35 @@ - + -
+
- + - + - + - + - - + + - - + + diff --git a/GUIs.Test.TestGUI/TestGUI.vbproj b/GUIs.Test.TestGUI/TestGUI.vbproj index e5b916f7..b3495590 100644 --- a/GUIs.Test.TestGUI/TestGUI.vbproj +++ b/GUIs.Test.TestGUI/TestGUI.vbproj @@ -62,8 +62,8 @@ ..\packages\NLog.4.7.5\lib\net45\NLog.dll - - ..\packages\Quartz.3.2.3\lib\net461\Quartz.dll + + ..\packages\Quartz.3.3.2\lib\net472\Quartz.dll diff --git a/GUIs.Test.TestGUI/packages.config b/GUIs.Test.TestGUI/packages.config index 9a1ba8fc..ec0e49b8 100644 --- a/GUIs.Test.TestGUI/packages.config +++ b/GUIs.Test.TestGUI/packages.config @@ -2,7 +2,7 @@ - + From 2f047b67d99734905a2a8ed85594dad58f2f7f98 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 15 Apr 2021 11:14:39 +0200 Subject: [PATCH 19/82] ZooFlow: Admin --- .../Administration/ClassValidation.vb | 3 + .../frmAdmin_SourceSQL.Designer.vb | 98 ++++++++++--------- .../Administration/frmAdmin_SourceSQL.resx | 6 +- .../Administration/frmAdmin_SourceSQL.vb | 68 ++++++++++--- .../Administration/frmAdmin_Start.Designer.vb | 24 ++--- GUIs.ZooFlow/DSIDB_Stammdaten.xss | 2 +- GUIs.ZooFlow/Globix/frmGlobix_Index.vb | 4 +- GUIs.ZooFlow/ZooFlow.vbproj | 1 + 8 files changed, 130 insertions(+), 76 deletions(-) create mode 100644 GUIs.ZooFlow/Administration/ClassValidation.vb 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 From 6ce39ea26176f514b31a5ed8370cd25e4dfc0efa Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 15 Apr 2021 11:15:09 +0200 Subject: [PATCH 20/82] Jobs/EDMI: Add Logging for GetOriginalEmailPath --- Modules.Jobs/EDMI/ZUGFeRD/EmailFunctions.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/Modules.Jobs/EDMI/ZUGFeRD/EmailFunctions.vb b/Modules.Jobs/EDMI/ZUGFeRD/EmailFunctions.vb index a34d866e..af586642 100644 --- a/Modules.Jobs/EDMI/ZUGFeRD/EmailFunctions.vb +++ b/Modules.Jobs/EDMI/ZUGFeRD/EmailFunctions.vb @@ -176,6 +176,7 @@ Public Class EmailFunctions If IO.File.Exists(oAttachmentPath) Then Return oAttachmentPath Else + _logger.Warn("Email File {0} does not exist. Empty String will be returned.", oAttachmentPath) Return String.Empty End If End Function From c8f77855ec3bd73d333aedd00733f3fc35a224b3 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 15 Apr 2021 11:15:26 +0200 Subject: [PATCH 21/82] Jobs: Version 1.5.1 --- Modules.Jobs/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules.Jobs/My Project/AssemblyInfo.vb b/Modules.Jobs/My Project/AssemblyInfo.vb index cfc53364..4b8eb148 100644 --- a/Modules.Jobs/My Project/AssemblyInfo.vb +++ b/Modules.Jobs/My Project/AssemblyInfo.vb @@ -30,5 +30,5 @@ Imports System.Runtime.InteropServices ' Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern ' übernehmen, indem Sie "*" eingeben: - - + + From 87b15f8540782b155c5bf7744b9bf032cd6ed932 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 15 Apr 2021 11:16:15 +0200 Subject: [PATCH 22/82] EDMIService: Update Deps, Add Logging, Clean up app.config --- Service.EDMIService/App.config | 20 +++----------------- Service.EDMIService/EDMIService.vb | 8 ++++---- Service.EDMIService/EDMIService.vbproj | 4 ++-- Service.EDMIService/packages.config | 2 +- 4 files changed, 10 insertions(+), 24 deletions(-) diff --git a/Service.EDMIService/App.config b/Service.EDMIService/App.config index 90304c22..511006d2 100644 --- a/Service.EDMIService/App.config +++ b/Service.EDMIService/App.config @@ -4,10 +4,7 @@ - + @@ -30,19 +27,8 @@ - - + + diff --git a/Service.EDMIService/EDMIService.vb b/Service.EDMIService/EDMIService.vb index 8ffa7337..aa107890 100644 --- a/Service.EDMIService/EDMIService.vb +++ b/Service.EDMIService/EDMIService.vb @@ -73,12 +73,12 @@ Public Class EDMIService #Region "=== Database ===" Public Function ReturnDatatableFromCache(Name As String, FilterExpression As String, SortByColumn As String) As TableResult Implements IEDMIService.ReturnDatatableFromCache Try - _Logger.Info($"ReturnDatatableFromCache, Datatable: {Name}") + _Logger.Info($"ReturnDatatableFromCache: Datatable: {Name}") Dim oDataset As DataSet = GlobalState.TableStore Dim oDataTable As DataTable = Nothing - _Logger.Debug("DataSet contains [{0}] datatables", oDataset.Tables.Count) + _Logger.Debug("ReturnDatatableFromCache: DataSet contains [{0}] datatables", oDataset.Tables.Count) If oDataset.Tables.Contains(Name) Then oDataTable = oDataset.Tables.Item(Name).Copy() @@ -99,13 +99,13 @@ Public Class EDMIService oFilteredTable.TableName = Name End If - _Logger.Debug("Datatable Stats for [{0}]:", Name) + _Logger.Debug("ReturnDatatableFromCache: Datatable Stats for [{0}]:", Name) _Logger.Debug("Unfiltered: [{0}] rows", oDataTable.Rows.Count) _Logger.Debug("Filtered: [{0}] rows", oFilteredTable.Rows.Count) Return New TableResult(oFilteredTable) Else - _Logger.Warn($"Datatable {Name} does not exist") + _Logger.Warn($"ReturnDatatableFromCache: Datatable {Name} does not exist") Dim oDetails As New DataTableDoesNotExistFault(Name) Throw New FaultException(Of DataTableDoesNotExistFault)(oDetails) End If diff --git a/Service.EDMIService/EDMIService.vbproj b/Service.EDMIService/EDMIService.vbproj index 17da2e73..6419ef82 100644 --- a/Service.EDMIService/EDMIService.vbproj +++ b/Service.EDMIService/EDMIService.vbproj @@ -73,8 +73,8 @@ ..\packages\NLog.4.7.5\lib\net45\NLog.dll - - ..\packages\Quartz.3.2.3\lib\net461\Quartz.dll + + ..\packages\Quartz.3.3.2\lib\net472\Quartz.dll diff --git a/Service.EDMIService/packages.config b/Service.EDMIService/packages.config index 4c04c214..bab29d1b 100644 --- a/Service.EDMIService/packages.config +++ b/Service.EDMIService/packages.config @@ -3,7 +3,7 @@ - + From 3e7aaae67ba0f12779dcf95b3c7791381fdce32f Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 15 Apr 2021 11:18:16 +0200 Subject: [PATCH 23/82] JobRunner: Clean up --- Service.JobRunner/JobRunner.vb | 4 +++- Service.JobRunner/JobRunner.vbproj | 7 +++++-- Service.JobRunner/packages.config | 3 ++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Service.JobRunner/JobRunner.vb b/Service.JobRunner/JobRunner.vb index 72637de0..93ed80c0 100644 --- a/Service.JobRunner/JobRunner.vb +++ b/Service.JobRunner/JobRunner.vb @@ -130,6 +130,8 @@ Public Class JobRunner _Logger = Logger End Sub + + Private Function GetLogger(name As String) As Logging.Logger Implements ILogProvider.GetLogger Return Function(level, func, exception, parameters) If exception IsNot Nothing Then @@ -149,7 +151,7 @@ Public Class JobRunner Throw New NotImplementedException() End Function - Private Function OpenMappedContext(key As String, value As String) As IDisposable Implements ILogProvider.OpenMappedContext + Public Function OpenMappedContext(key As String, value As Object, Optional destructure As Boolean = False) As IDisposable Implements ILogProvider.OpenMappedContext _Logger.Warn("OpenMappedContext is not implemented") Throw New NotImplementedException() End Function diff --git a/Service.JobRunner/JobRunner.vbproj b/Service.JobRunner/JobRunner.vbproj index 98c31c5b..2a9edc6c 100644 --- a/Service.JobRunner/JobRunner.vbproj +++ b/Service.JobRunner/JobRunner.vbproj @@ -51,11 +51,14 @@ + + ..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll + ..\packages\NLog.4.7.5\lib\net45\NLog.dll - - ..\packages\Quartz.3.0.7\lib\net452\Quartz.dll + + ..\packages\Quartz.3.3.2\lib\net461\Quartz.dll diff --git a/Service.JobRunner/packages.config b/Service.JobRunner/packages.config index 01a189b1..fe5d07b1 100644 --- a/Service.JobRunner/packages.config +++ b/Service.JobRunner/packages.config @@ -1,5 +1,6 @@  + - + \ No newline at end of file From 925b91261a34e2a67a362b6ab156f1e018f7482f Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 15 Apr 2021 11:18:27 +0200 Subject: [PATCH 24/82] VirtualDrive: Clean up --- VirtualDrive/App.config | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/VirtualDrive/App.config b/VirtualDrive/App.config index 56efbc7b..3d347499 100644 --- a/VirtualDrive/App.config +++ b/VirtualDrive/App.config @@ -1,6 +1,14 @@ - + + + + + + + + + \ No newline at end of file From 7e2359f0063c10585d67905d993621ef4cff1ef6 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 15 Apr 2021 13:31:35 +0200 Subject: [PATCH 25/82] Database: Expose GetConnection function --- Modules.Database/MSSQLServer.vb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Modules.Database/MSSQLServer.vb b/Modules.Database/MSSQLServer.vb index 0d850307..05f67d8b 100644 --- a/Modules.Database/MSSQLServer.vb +++ b/Modules.Database/MSSQLServer.vb @@ -63,6 +63,18 @@ Public Class MSSQLServer Return oConnectionStringBuilder.ToString End Function + Public Function GetConnection() As SqlConnection + Try + Dim oConnection = GetSQLConnection() + oConnection.Open() + + Return oConnection + Catch ex As Exception + _Logger.Error(ex) + Return Nothing + End Try + End Function + Private Function MaybeGetTransaction(Connection As SqlConnection, Mode As TransactionMode, Transaction As SqlTransaction) As SqlTransaction If Mode = TransactionMode.NoTransaction Then Return Nothing From d17ef894a05a9db528f552895a22f7b120c5009d Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 15 Apr 2021 13:31:44 +0200 Subject: [PATCH 26/82] Database: Version 2.0.1 --- Modules.Database/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules.Database/My Project/AssemblyInfo.vb b/Modules.Database/My Project/AssemblyInfo.vb index aaad80c1..baaf10e7 100644 --- a/Modules.Database/My Project/AssemblyInfo.vb +++ b/Modules.Database/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + From a45b8db1003988f621567e2cc1e876ed77886566 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 15 Apr 2021 15:50:25 +0200 Subject: [PATCH 27/82] Database: Remove TestCanConnect for most functions, check connection state for TestCanConnect, check for empty connection string in maskconnectionstring --- Modules.Database/MSSQLServer.vb | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/Modules.Database/MSSQLServer.vb b/Modules.Database/MSSQLServer.vb index 05f67d8b..93bf5a68 100644 --- a/Modules.Database/MSSQLServer.vb +++ b/Modules.Database/MSSQLServer.vb @@ -168,7 +168,11 @@ Public Class MSSQLServer End If _Logger.Debug("Testing connection to [{0}]", MaskConnectionString(Connection.ConnectionString)) - Connection.Open() + + If Connection.State = ConnectionState.Closed Then + Connection.Open() + End If + Connection.Close() Return True Catch ex As Exception @@ -199,6 +203,10 @@ Public Class MSSQLServer Private Function MaskConnectionString(ConnectionString As String) As String Try + If ConnectionString Is Nothing OrElse ConnectionString.Length = 0 Then + Throw New ArgumentNullException("ConnectionString") + End If + Dim oBuilder As New SqlConnectionStringBuilder() With {.ConnectionString = ConnectionString} Dim oConnectionString = ConnectionString.Replace(oBuilder.Password, "XXXXX") Return oConnectionString @@ -229,7 +237,6 @@ Public Class MSSQLServer End Using End Function - Public Async Function GetDatatableAsync(SqlCommand As String) As Task(Of DataTable) Return Await Task.Run(Function() GetDatatable(SqlCommand, _Timeout)) End Function @@ -244,10 +251,6 @@ Public Class MSSQLServer Optional TransactionMode As TransactionMode = TransactionMode.WithTransaction, Optional Transaction As SqlTransaction = Nothing, Optional Timeout As Integer = 120) As DataTable - If TestCanConnect(SqlConnection) = False Then - Return Nothing - End If - Dim oTransaction As SqlTransaction = MaybeGetTransaction(SqlConnection, TransactionMode, Transaction) Dim oTable As New DataTable() With {.TableName = TABLE_DEFAULT} @@ -262,8 +265,6 @@ Public Class MSSQLServer _Logger.Debug("GetDatatableWithConnectionObject: Running Query [{0}]", SqlCommand) oAdapter.Fill(oTable) - - _Logger.Debug("GetDatatableWithConnectionObject: Running Query [{0}]", SqlCommand) Catch ex As Exception _Logger.Error(ex) _Logger.Warn("GetDatatableWithConnectionObject: Error in GetDatatableWithConnection while executing command: [{0}]", SqlCommand) @@ -308,10 +309,6 @@ Public Class MSSQLServer Optional TransactionMode As TransactionMode = TransactionMode.WithTransaction, Optional Transaction As SqlTransaction = Nothing, Optional Timeout As Integer = 120) As Boolean - If TestCanConnect(SqlConnection) = False Then - Return False - End If - Dim oTransaction As SqlTransaction = MaybeGetTransaction(SqlConnection, TransactionMode, Transaction) Try @@ -365,9 +362,6 @@ Public Class MSSQLServer Optional TransactionMode As TransactionMode = TransactionMode.WithTransaction, Optional Transaction As SqlTransaction = Nothing, Optional Timeout As Integer = 120) As Object - If TestCanConnect() = False Then - Return Nothing - End If Dim oTransaction As SqlTransaction = MaybeGetTransaction(SqlConnection, TransactionMode, Transaction) Dim oResult As Object = Nothing @@ -433,10 +427,6 @@ Public Class MSSQLServer ''' Optional Timeout ''' Public Sub NewExecuteNonQueryAsync(SqlCommand As String, Optional commandtimeout As Integer = 120) - If TestCanConnect() = False Then - Exit Sub - End If - _Logger.Debug("NewExecuteNonQueryAsync: Running Query [{0}]", SqlCommand) Try From 673e8b83c57e43e8eba8fca1ceb20c15ce290d52 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 15 Apr 2021 15:51:46 +0200 Subject: [PATCH 28/82] Database: Version 2.0.2 --- Modules.Database/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules.Database/My Project/AssemblyInfo.vb b/Modules.Database/My Project/AssemblyInfo.vb index baaf10e7..cd527ffa 100644 --- a/Modules.Database/My Project/AssemblyInfo.vb +++ b/Modules.Database/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + From 07ce5488dfc28980fa0a2a45aed176fe0c519788 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 15 Apr 2021 15:52:17 +0200 Subject: [PATCH 29/82] EDMIService: Remove Calls to UpdateTraceLogging --- Service.EDMIService/WindowsService.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Service.EDMIService/WindowsService.vb b/Service.EDMIService/WindowsService.vb index 26bb05b8..06bb68e3 100644 --- a/Service.EDMIService/WindowsService.vb +++ b/Service.EDMIService/WindowsService.vb @@ -52,7 +52,7 @@ Public Class WindowsService End If Next Catch ex As Exception - + _Logger.Error(ex) End Try _Logger.Info("Service {0} is starting...", SERVICE_DISPLAY_NAME) @@ -63,7 +63,7 @@ Public Class WindowsService _Config = _ConfigManager.Config _LogConfig.Debug = _ConfigManager.Config.Debug - UpdateTraceLogging() + 'UpdateTraceLogging() Dim oTimer As New Timers.Timer(60000) AddHandler oTimer.Elapsed, Sub() @@ -72,7 +72,7 @@ Public Class WindowsService _Config = _ConfigManager.Config _LogConfig.Debug = _ConfigManager.Config.Debug - UpdateTraceLogging() + 'UpdateTraceLogging() End Sub oTimer.Start() From f6fc3be8ed4d558891f22a71d5ab182ba3c7d780 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 15 Apr 2021 15:57:09 +0200 Subject: [PATCH 30/82] ZUGFeRDService: Integrate MSSQL Transactions, Rollback for Application Exceptions #MR-2 --- Modules.Jobs/EDMI/ZUGFeRD/EmailFunctions.vb | 9 +- .../EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb | 112 +++++++++++------- 2 files changed, 74 insertions(+), 47 deletions(-) diff --git a/Modules.Jobs/EDMI/ZUGFeRD/EmailFunctions.vb b/Modules.Jobs/EDMI/ZUGFeRD/EmailFunctions.vb index af586642..57436c0d 100644 --- a/Modules.Jobs/EDMI/ZUGFeRD/EmailFunctions.vb +++ b/Modules.Jobs/EDMI/ZUGFeRD/EmailFunctions.vb @@ -2,6 +2,7 @@ Imports DigitalData.Modules.Database Imports System.Data Imports System.IO +Imports System.Data.SqlClient Public Class EmailFunctions Private ReadOnly _logConfig As LogConfig @@ -62,7 +63,7 @@ Public Class EmailFunctions _logger.Error(ex) End Try End Sub - Public Sub AddToEmailQueueMSSQL(MessageId As String, BodyText As String, pEmailData As EmailData, SourceProcedure As String, pEmailAccountId As Integer) + Public Sub AddToEmailQueueMSSQL(MessageId As String, BodyText As String, pEmailData As EmailData, SourceProcedure As String, pEmailAccountId As Integer, Transaction As SqlTransaction) If pEmailData Is Nothing Then _logger.Warn("EmailData is empty. Email will not be sent!") Exit Sub @@ -97,7 +98,7 @@ Public Class EmailFunctions _logger.Debug("Subject: {0}", oSubject) _logger.Debug("Body {0}", oFinalBodyText) Dim osql = $"Select MAX(GUID) FROM TBEMLP_HISTORY WHERE EMAIL_MSGID = '{MessageId}'" - Dim oHistoryID = _mssql.GetScalarValue(osql) + Dim oHistoryID = _mssql.GetScalarValue(osql, Transaction) 'osql = $"select * from TBEMLP_EMAIL_OUT where REFERENCE_ID = {oHistoryID} and EMAIL_ADRESS = '{oEmailTo}' and EMAIL_SUBJ = '{oSubject}'" @@ -128,7 +129,7 @@ Public Class EmailFunctions ,'{SourceProcedure}' ,'{oCreatedWho}' ,'{oAttachment}')" - _mssql.ExecuteNonQuery(oInsert) + _mssql.ExecuteNonQuery(oInsert, Transaction) Else 'If oDTResult.Rows.Count = 0 Then ' _logger.Debug("Email has already been sent!!") @@ -173,7 +174,7 @@ Public Class EmailFunctions Dim oAttachmentFile = MessageId & ".eml" Dim oAttachmentPath = Path.Combine(oAttachmentDirectory, oAttachmentFile) - If IO.File.Exists(oAttachmentPath) Then + If File.Exists(oAttachmentPath) Then Return oAttachmentPath Else _logger.Warn("Email File {0} does not exist. Empty String will be returned.", oAttachmentPath) diff --git a/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb b/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb index 30105d97..bb61417b 100644 --- a/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb +++ b/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb @@ -2,18 +2,14 @@ Imports System.Data Imports System.IO Imports System.Linq -Imports System.Reflection Imports System.Security.Cryptography -Imports System.Text.RegularExpressions -Imports System.Xml -Imports DigitalData.Modules.Filesystem Imports DigitalData.Modules.Database Imports DigitalData.Modules.Interfaces Imports DigitalData.Modules.Interfaces.Exceptions Imports DigitalData.Modules.Jobs.Exceptions Imports DigitalData.Modules.Logging Imports FirebirdSql.Data.FirebirdClient -Imports GdPicture14 +Imports System.Data.SqlClient Public Class ImportZUGFeRDFiles Implements IJob @@ -111,11 +107,11 @@ Public Class ImportZUGFeRDFiles Return oEmailData End Function - Private Sub AddRejectedState(oMessageID As String, oTitle As String, oTitle1 As String, oComment As String) + Private Sub AddRejectedState(oMessageID As String, oTitle As String, oTitle1 As String, oComment As String, Transaction As SqlTransaction) Try 'PRCUST_ADD_HISTORY_STATE: @MessageID VARCHAR(250), @TITLE1 VARCHAR(250), @TITLE2 VARCHAR(250) Dim oSQL = $"EXEC PRCUST_ADD_HISTORY_STATE '{oMessageID}','{oTitle}','{oTitle1}','{oComment.Replace("'", "''")}'" - _mssql.ExecuteNonQuery(oSQL) + _mssql.ExecuteNonQuery(oSQL, Transaction) Catch ex As Exception _logger.Error(ex) End Try @@ -159,12 +155,18 @@ Public Class ImportZUGFeRDFiles For Each oFileGroup In oGrouped ' Start a new transaction for each file group. ' This way we can rollback database changes for the whole filegroup in case something goes wrong. - Dim oConnection As FbConnection = _firebird.GetConnection() - Dim oTransaction As FbTransaction = oConnection.BeginTransaction() + Dim oFBConnection As FbConnection = _firebird.GetConnection() + Dim oFBTransaction As FbTransaction = oFBConnection.BeginTransaction() + + Dim oSQLConnection As SqlConnection = _mssql.GetConnection() + Dim oSQLTransaction As SqlTransaction = oSQLConnection.BeginTransaction() + ' Count the amount of ZUGFeRD files Dim oZUGFeRDCount As Integer = 0 + ' Set the default Move Directory Dim oMoveDirectory As String = oArgs.ErrorDirectory + ' Flag to save if the whole process was a success. ' Will be set only at the end of the function if no error occurred. Dim oIsSuccess As Boolean = False @@ -275,10 +277,9 @@ Public Class ImportZUGFeRDFiles Dim oDelSQL = $"DELETE FROM TBEDMI_ITEM_VALUE where REFERENCE_GUID = '{oMessageId}'" Dim oStep As String - oStep = "Firebird TBEDMI_ITEM_VALUE Delete messageID Items" Try - _firebird.ExecuteNonQueryWithConnection(oDelSQL, oConnection, Firebird.TransactionMode.ExternalTransaction, oTransaction) + _firebird.ExecuteNonQueryWithConnection(oDelSQL, oFBConnection) Catch ex As Exception _logger.Error(ex) _logger.Warn("Step [{0}] with SQL [{1}] was not successful.", oStep, oDelSQL) @@ -287,7 +288,7 @@ Public Class ImportZUGFeRDFiles If oArgs.InsertIntoSQLServer = True Then oStep = "MSSQL TBEDMI_ITEM_VALUE Delete messageID Items" Try - _mssql.ExecuteNonQuery(oDelSQL) + _mssql.ExecuteNonQueryWithConnectionObject(oDelSQL, oSQLConnection) Catch ex As Exception _logger.Warn("Step [{0}] with SQL [{1}] was not successful.", oStep, oDelSQL) End Try @@ -307,13 +308,13 @@ Public Class ImportZUGFeRDFiles _logger.Debug("Mapping Property [{0}] with value [{1}], Will be inserted into table [{2}]", oProperty.TableColumn, oProperty.Value.Replace("'", "''"), oProperty.TableName) ' Insert into SQL Server If oArgs.InsertIntoSQLServer = True Then - Dim oResult = _mssql.ExecuteNonQuery(oCommand) + Dim oResult = _mssql.ExecuteNonQueryWithConnectionObject(oCommand, oSQLConnection, MSSQLServer.TransactionMode.ExternalTransaction, oSQLTransaction) If oResult = False Then _logger.Warn($"SQL Command [{oCommand}] was not successful. Check the log.") End If End If ' Insert into Firebird - _firebird.ExecuteNonQueryWithConnection(oCommand, oConnection, Firebird.TransactionMode.ExternalTransaction, oTransaction) + _firebird.ExecuteNonQueryWithConnection(oCommand, oFBConnection, Firebird.TransactionMode.ExternalTransaction, oFBTransaction) Next Next @@ -326,9 +327,11 @@ Public Class ImportZUGFeRDFiles 'Log the History If oMD5CheckSum <> String.Empty Then Dim oInsertCommand = $"INSERT INTO TBEDM_ZUGFERD_HISTORY_IN (MESSAGE_ID, MD5HASH) VALUES ('{oMessageId}', '{oMD5CheckSum}')" - _firebird.ExecuteNonQueryWithConnection(oInsertCommand, oConnection, Firebird.TransactionMode.ExternalTransaction, oTransaction) - 'commit the transaction - oTransaction.Commit() + _firebird.ExecuteNonQueryWithConnection(oInsertCommand, oFBConnection, Firebird.TransactionMode.ExternalTransaction, oFBTransaction) + + ' History ID is only need in case of an error + oFBTransaction.Commit() + Try Dim oSQL = $"SELECT MAX(GUID) FROM TBEDM_ZUGFERD_HISTORY_IN WHERE MESSAGE_ID = '{oMessageId}'" HISTORY_ID = _firebird.GetScalarValue(oSQL) @@ -342,55 +345,55 @@ Public Class ImportZUGFeRDFiles Catch ex As MD5HashException _logger.Error(ex) - oTransaction.Rollback() + 'oFBTransaction.Rollback() Dim oSQL = $"UPDATE TBEDM_ZUGFERD_HISTORY_IN SET COMMENT = 'REJECTED - Already processed (MD5Hash)' WHERE GUID = '{HISTORY_ID}'" _firebird.ExecuteNonQuery(oSQL) Dim oBody = EmailStrings.EMAIL_MD5_ERROR Dim oEmailData = MoveAndRenameEmailToRejected(oArgs, oMessageId) - _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "MD5HashException", _EmailOutAccountId) - AddRejectedState(oMessageId, "MD5HashException", "Die gesendete Rechnung wurde bereits verarbeitet!", "") + _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "MD5HashException", _EmailOutAccountId, oSQLTransaction) + AddRejectedState(oMessageId, "MD5HashException", "Die gesendete Rechnung wurde bereits verarbeitet!", "", oSQLTransaction) Catch ex As InvalidFerdException _logger.Error(ex) - oTransaction.Rollback() + 'oFBTransaction.Rollback() Dim oSQL = $"UPDATE TBEDM_ZUGFERD_HISTORY_IN SET COMMENT = 'REJECTED - ZUGFeRD yes but incorrect format' WHERE GUID = '{HISTORY_ID}'" _firebird.ExecuteNonQuery(oSQL) Dim oBody = EmailStrings.EMAIL_INVALID_DOCUMENT Dim oEmailData = MoveAndRenameEmailToRejected(oArgs, oMessageId) - _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "InvalidFerdException", _EmailOutAccountId) - AddRejectedState(oMessageId, "InvalidFerdException", "Inkorrekte Formate", "") + _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "InvalidFerdException", _EmailOutAccountId, oSQLTransaction) + AddRejectedState(oMessageId, "InvalidFerdException", "Inkorrekte Formate", "", oSQLTransaction) Catch ex As TooMuchFerdsException _logger.Error(ex) - oTransaction.Rollback() + 'oFBTransaction.Rollback() Dim oSQL = $"UPDATE TBEDM_ZUGFERD_HISTORY_IN SET COMMENT = 'REJECTED - More than one ZUGFeRD-document in email' WHERE GUID = '{HISTORY_ID}'" _firebird.ExecuteNonQuery(oSQL) Dim oBody = EmailStrings.EMAIL_TOO_MUCH_FERDS Dim oEmailData = MoveAndRenameEmailToRejected(oArgs, oMessageId) - _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "TooMuchFerdsException", _EmailOutAccountId) - AddRejectedState(oMessageId, "TooMuchFerdsException", "Email enthielt mehr als ein ZUGFeRD-Dokument", "") + _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "TooMuchFerdsException", _EmailOutAccountId, oSQLTransaction) + AddRejectedState(oMessageId, "TooMuchFerdsException", "Email enthielt mehr als ein ZUGFeRD-Dokument", "", oSQLTransaction) Catch ex As NoFerdsException _logger.Error(ex) - oTransaction.Rollback() + 'oFBTransaction.Rollback() Dim oSQL = $"UPDATE TBEDM_ZUGFERD_HISTORY_IN SET COMMENT = 'REJECTED - no ZUGFeRD-Document in email' WHERE GUID = '{HISTORY_ID}'" _firebird.ExecuteNonQuery(oSQL) Dim oBody = EmailStrings.EMAIL_NO_FERDS Dim oEmailData = MoveAndRenameEmailToRejected(oArgs, oMessageId) - _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "NoFerdsException", _EmailOutAccountId) - AddRejectedState(oMessageId, "NoFerdsException", " Email enthielt keine ZUGFeRD-Dokumente", "") + _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "NoFerdsException", _EmailOutAccountId, oSQLTransaction) + AddRejectedState(oMessageId, "NoFerdsException", " Email enthielt keine ZUGFeRD-Dokumente", "", oSQLTransaction) Catch ex As MissingValueException _logger.Error(ex) - oTransaction.Rollback() + 'oFBTransaction.Rollback() Dim oMessage As String = "" For Each prop In oMissingProperties @@ -401,33 +404,56 @@ Public Class ImportZUGFeRDFiles Dim oBody = CreateBodyForMissingProperties(ex.File.Name, oMissingProperties) Dim oEmailData = MoveAndRenameEmailToRejected(oArgs, oMessageId) - _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "MissingValueException", _EmailOutAccountId) - AddRejectedState(oMessageId, "MissingValueException", "Es fehlten ZugferdSpezifikationen", oMessage) + _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "MissingValueException", _EmailOutAccountId, oSQLTransaction) + AddRejectedState(oMessageId, "MissingValueException", "Es fehlten ZugferdSpezifikationen", oMessage, oSQLTransaction) Catch ex As OutOfMemoryException _logger.Warn("OutOfMemory Error occurred: {0}", ex.Message) _logger.Error(ex) - oTransaction.Rollback() - oMoveDirectory = DIRECTORY_DONT_MOVE + ' Rollback Firebird + oFBTransaction.Rollback() - 'Dim oSQL = $"UPDATE TBEDM_ZUGFERD_HISTORY_IN SET COMMENT = 'REJECTED - Out of memory' WHERE GUID = '{HISTORY_ID}'" - '_firebird.ExecuteNonQuery(oSQL) - 'AddRejectedState(oMessageId, "OutOfMemoryException", "", ex.Message) + ' Rollback MSSQL + oSQLTransaction.Rollback() + + oMoveDirectory = DIRECTORY_DONT_MOVE Catch ex As Exception _logger.Warn("Unknown Error occurred: {0}", ex.Message) _logger.Error(ex) - oTransaction.Rollback() + + ' Rollback Firebird + oFBTransaction.Rollback() + + ' Rollback MSSQL + oSQLTransaction.Rollback() oMoveDirectory = DIRECTORY_DONT_MOVE - 'Dim oSQL = $"UPDATE TBEDM_ZUGFERD_HISTORY_IN SET COMMENT = 'REJECTED - Unknown error occured' WHERE GUID = '{HISTORY_ID}'" - '_firebird.ExecuteNonQuery(oSQL) - 'oMoveDirectory = oArgs.ErrorDirectory - 'AddRejectedState(oMessageId, "UnexpectedException", "", ex.Message) Finally - oConnection.Close() + Try + ' If everything went OK, finally commit all changes to the Database + ' ================================================================== + If oIsSuccess Then + ' Commit SQL Transaction + oSQLTransaction.Commit() + + ' Commit Firebird Transaction + oFBTransaction.Commit() + End If + Catch ex As Exception + _logger.Error(ex) + _logger.Warn("Database Transactions were not committed successfully.") + End Try + + Try + oFBConnection.Close() + oSQLConnection.Close() + Catch ex As Exception + _logger.Error(ex) + _logger.Warn("Database Connections were not closed successfully.") + End Try Try ' If an application error occurred, dont move files so they will be processed again later From 04fd63a9c7e8b0c791585a9d31312ec47ea32f2b Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 15 Apr 2021 16:06:13 +0200 Subject: [PATCH 31/82] EDMIService: Remove Listing Tables in Job Listener --- Service.EDMIService/Scheduler/JobListener.vb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Service.EDMIService/Scheduler/JobListener.vb b/Service.EDMIService/Scheduler/JobListener.vb index 42f2d4f6..9fabc4bf 100644 --- a/Service.EDMIService/Scheduler/JobListener.vb +++ b/Service.EDMIService/Scheduler/JobListener.vb @@ -188,11 +188,6 @@ Public Class JobListener End If End If - _Logger.Debug("Listing Tables in DataSet") - For Each oDataTable As DataTable In Dataset.Tables - _Logger.Debug(oDataTable.TableName) - Next - ' Used for debugging relations and constraints '_Logger.Debug("Dataset AFTER saving datatables") 'ListTables(Dataset) From 5e45aef7ff8b48ec2865a9b44d901124076057c3 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 19 Apr 2021 14:03:33 +0200 Subject: [PATCH 32/82] RegexEditor: Improve Look and Feel --- .../My Project/AssemblyInfo.vb | 6 +- .../My Project/Resources.Designer.vb | 62 +++++- .../My Project/Resources.resx | 32 +++- Controls.RegexEditor/My Project/licenses.licx | 3 + Controls.RegexEditor/RegexEditor.vbproj | 41 +++- Controls.RegexEditor/Resources/about.svg | 19 ++ .../Resources/actions_check.svg | 15 ++ .../Resources/actions_check1.svg | 15 ++ .../Resources/definednameuseinformula.svg | 9 + .../Resources/definednameuseinformula1.svg | 9 + .../Resources/definednameuseinformula2.svg | 9 + .../frmRegexEditor.Designer.vb | 176 +++++++++++------- Controls.RegexEditor/frmRegexEditor.vb | 17 +- 13 files changed, 326 insertions(+), 87 deletions(-) create mode 100644 Controls.RegexEditor/My Project/licenses.licx create mode 100644 Controls.RegexEditor/Resources/about.svg create mode 100644 Controls.RegexEditor/Resources/actions_check.svg create mode 100644 Controls.RegexEditor/Resources/actions_check1.svg create mode 100644 Controls.RegexEditor/Resources/definednameuseinformula.svg create mode 100644 Controls.RegexEditor/Resources/definednameuseinformula1.svg create mode 100644 Controls.RegexEditor/Resources/definednameuseinformula2.svg diff --git a/Controls.RegexEditor/My Project/AssemblyInfo.vb b/Controls.RegexEditor/My Project/AssemblyInfo.vb index bc8b0f65..e26b97d7 100644 --- a/Controls.RegexEditor/My Project/AssemblyInfo.vb +++ b/Controls.RegexEditor/My Project/AssemblyInfo.vb @@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Controls.RegexEditor/My Project/Resources.Designer.vb b/Controls.RegexEditor/My Project/Resources.Designer.vb index 6aabab17..3229c33d 100644 --- a/Controls.RegexEditor/My Project/Resources.Designer.vb +++ b/Controls.RegexEditor/My Project/Resources.Designer.vb @@ -22,7 +22,7 @@ Namespace My.Resources ''' ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ @@ -59,5 +59,65 @@ Namespace My.Resources resourceCulture = value End Set End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property about() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("about", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property actions_check() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("actions_check", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property actions_check1() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("actions_check1", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property definednameuseinformula() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("definednameuseinformula", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property definednameuseinformula1() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("definednameuseinformula1", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property definednameuseinformula2() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("definednameuseinformula2", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property End Module End Namespace diff --git a/Controls.RegexEditor/My Project/Resources.resx b/Controls.RegexEditor/My Project/Resources.resx index af7dbebb..9f345215 100644 --- a/Controls.RegexEditor/My Project/Resources.resx +++ b/Controls.RegexEditor/My Project/Resources.resx @@ -46,7 +46,7 @@ mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with - : System.Serialization.Formatters.Binary.BinaryFormatter + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 @@ -60,6 +60,7 @@ : and then encoded with base64 encoding. --> + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -109,9 +112,28 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\definednameuseinformula.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\definednameuseinformula1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\actions_check.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\actions_check1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\definednameuseinformula2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\about.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + \ No newline at end of file diff --git a/Controls.RegexEditor/My Project/licenses.licx b/Controls.RegexEditor/My Project/licenses.licx new file mode 100644 index 00000000..4145358b --- /dev/null +++ b/Controls.RegexEditor/My Project/licenses.licx @@ -0,0 +1,3 @@ +DevExpress.XtraEditors.TextEdit, 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.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/Controls.RegexEditor/RegexEditor.vbproj b/Controls.RegexEditor/RegexEditor.vbproj index fa2a26ed..bfcd372a 100644 --- a/Controls.RegexEditor/RegexEditor.vbproj +++ b/Controls.RegexEditor/RegexEditor.vbproj @@ -48,21 +48,33 @@ On - - - - - + + + + + + False + D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.XtraEditors.v19.2.dll + + + False + D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.XtraLayout.v19.2.dll + + + + + + @@ -102,6 +114,7 @@ + VbMyResourcesResXFileCodeGenerator Resources.Designer.vb @@ -130,5 +143,23 @@ Language + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Controls.RegexEditor/Resources/about.svg b/Controls.RegexEditor/Resources/about.svg new file mode 100644 index 00000000..1f67213d --- /dev/null +++ b/Controls.RegexEditor/Resources/about.svg @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/Controls.RegexEditor/Resources/actions_check.svg b/Controls.RegexEditor/Resources/actions_check.svg new file mode 100644 index 00000000..35c68028 --- /dev/null +++ b/Controls.RegexEditor/Resources/actions_check.svg @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/Controls.RegexEditor/Resources/actions_check1.svg b/Controls.RegexEditor/Resources/actions_check1.svg new file mode 100644 index 00000000..35c68028 --- /dev/null +++ b/Controls.RegexEditor/Resources/actions_check1.svg @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/Controls.RegexEditor/Resources/definednameuseinformula.svg b/Controls.RegexEditor/Resources/definednameuseinformula.svg new file mode 100644 index 00000000..0d27a20b --- /dev/null +++ b/Controls.RegexEditor/Resources/definednameuseinformula.svg @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/Controls.RegexEditor/Resources/definednameuseinformula1.svg b/Controls.RegexEditor/Resources/definednameuseinformula1.svg new file mode 100644 index 00000000..0d27a20b --- /dev/null +++ b/Controls.RegexEditor/Resources/definednameuseinformula1.svg @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/Controls.RegexEditor/Resources/definednameuseinformula2.svg b/Controls.RegexEditor/Resources/definednameuseinformula2.svg new file mode 100644 index 00000000..0d27a20b --- /dev/null +++ b/Controls.RegexEditor/Resources/definednameuseinformula2.svg @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/Controls.RegexEditor/frmRegexEditor.Designer.vb b/Controls.RegexEditor/frmRegexEditor.Designer.vb index 1e629ce4..a6d6ac0a 100644 --- a/Controls.RegexEditor/frmRegexEditor.Designer.vb +++ b/Controls.RegexEditor/frmRegexEditor.Designer.vb @@ -1,6 +1,6 @@  _ Partial Class frmRegexEditor - Inherits DevExpress.XtraEditors.XtraForm + Inherits DevExpress.XtraBars.Ribbon.RibbonForm 'Form overrides dispose to clean up the component list. _ @@ -19,62 +19,29 @@ Partial Class frmRegexEditor 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.btnTest = New System.Windows.Forms.Button() - Me.btnSave = New System.Windows.Forms.Button() - Me.labelResult = New System.Windows.Forms.Label() - Me.Label3 = New System.Windows.Forms.Label() Me.Label2 = New System.Windows.Forms.Label() Me.txtTest = New System.Windows.Forms.TextBox() Me.Label4 = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() Me.txtRegex = New System.Windows.Forms.TextBox() + Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem() + Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() + Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.labelResult = New DevExpress.XtraBars.BarStaticItem() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' - 'btnTest - ' - Me.btnTest.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnTest.Location = New System.Drawing.Point(187, 192) - Me.btnTest.Name = "btnTest" - Me.btnTest.Size = New System.Drawing.Size(112, 31) - Me.btnTest.TabIndex = 23 - Me.btnTest.Text = "Test" - Me.btnTest.UseVisualStyleBackColor = True - ' - 'btnSave - ' - Me.btnSave.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnSave.DialogResult = System.Windows.Forms.DialogResult.OK - Me.btnSave.Location = New System.Drawing.Point(305, 192) - Me.btnSave.Name = "btnSave" - Me.btnSave.Size = New System.Drawing.Size(112, 31) - Me.btnSave.TabIndex = 22 - Me.btnSave.Text = "Speichern" - Me.btnSave.UseVisualStyleBackColor = True - ' - 'labelResult - ' - Me.labelResult.AutoSize = True - Me.labelResult.Location = New System.Drawing.Point(12, 163) - Me.labelResult.Name = "labelResult" - Me.labelResult.Size = New System.Drawing.Size(284, 13) - Me.labelResult.TabIndex = 21 - Me.labelResult.Text = "Klicken Sie auf Test, um die Regular Expression zu testen." - ' - 'Label3 - ' - Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(12, 150) - Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(52, 13) - Me.Label3.TabIndex = 20 - Me.Label3.Text = "Ergebnis:" - ' 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(12, 100) + Me.Label2.Location = New System.Drawing.Point(12, 151) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(63, 13) + Me.Label2.Size = New System.Drawing.Size(64, 13) Me.Label2.TabIndex = 19 Me.Label2.Text = "Test String:" ' @@ -82,15 +49,16 @@ Partial Class frmRegexEditor ' Me.txtTest.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.txtTest.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtTest.Location = New System.Drawing.Point(12, 116) + Me.txtTest.Font = New System.Drawing.Font("Consolas", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtTest.Location = New System.Drawing.Point(12, 167) + Me.txtTest.Multiline = True Me.txtTest.Name = "txtTest" - Me.txtTest.Size = New System.Drawing.Size(405, 20) + Me.txtTest.Size = New System.Drawing.Size(487, 136) Me.txtTest.TabIndex = 18 ' 'Label4 ' - Me.Label4.Location = New System.Drawing.Point(12, 48) + Me.Label4.Location = New System.Drawing.Point(12, 110) Me.Label4.Name = "Label4" Me.Label4.Size = New System.Drawing.Size(419, 33) Me.Label4.TabIndex = 17 @@ -100,9 +68,9 @@ Partial Class frmRegexEditor 'Label1 ' Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(12, 9) + Me.Label1.Location = New System.Drawing.Point(12, 69) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(103, 13) + Me.Label1.Size = New System.Drawing.Size(108, 13) Me.Label1.TabIndex = 16 Me.Label1.Text = "Regular Expression:" ' @@ -110,41 +78,117 @@ Partial Class frmRegexEditor ' Me.txtRegex.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.txtRegex.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtRegex.Location = New System.Drawing.Point(12, 25) + Me.txtRegex.Font = New System.Drawing.Font("Consolas", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtRegex.Location = New System.Drawing.Point(12, 85) Me.txtRegex.Name = "txtRegex" - Me.txtRegex.Size = New System.Drawing.Size(405, 20) + Me.txtRegex.Size = New System.Drawing.Size(487, 22) Me.txtRegex.TabIndex = 15 ' + 'RibbonControl1 + ' + Me.RibbonControl1.CommandLayout = DevExpress.XtraBars.Ribbon.CommandLayout.Simplified + Me.RibbonControl1.ExpandCollapseItem.Id = 0 + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarStaticItem1, Me.labelResult}) + Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) + Me.RibbonControl1.MaxItemId = 6 + Me.RibbonControl1.Name = "RibbonControl1" + Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) + Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] + Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide + Me.RibbonControl1.ShowToolbarCustomizeItem = False + Me.RibbonControl1.Size = New System.Drawing.Size(511, 66) + Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 + Me.RibbonControl1.Toolbar.ShowCustomizeItem = False + ' + 'BarButtonItem1 + ' + Me.BarButtonItem1.Caption = "Speichern und schließen" + Me.BarButtonItem1.Id = 1 + Me.BarButtonItem1.ImageOptions.SvgImage = Global.DigitalData.Controls.RegexEditor.My.Resources.Resources.actions_check1 + Me.BarButtonItem1.Name = "BarButtonItem1" + ' + 'BarButtonItem2 + ' + Me.BarButtonItem2.Caption = "Regular Expression testen" + Me.BarButtonItem2.Id = 2 + Me.BarButtonItem2.ImageOptions.SvgImage = Global.DigitalData.Controls.RegexEditor.My.Resources.Resources.definednameuseinformula1 + Me.BarButtonItem2.Name = "BarButtonItem2" + ' + 'BarStaticItem1 + ' + Me.BarStaticItem1.Caption = "Ergebnis" + Me.BarStaticItem1.Id = 3 + Me.BarStaticItem1.ImageOptions.SvgImage = Global.DigitalData.Controls.RegexEditor.My.Resources.Resources.about + Me.BarStaticItem1.Name = "BarStaticItem1" + Me.BarStaticItem1.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph + ' + 'RibbonPage1 + ' + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) + Me.RibbonPage1.Name = "RibbonPage1" + Me.RibbonPage1.Text = "RibbonPage1" + ' + 'RibbonPageGroup1 + ' + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2) + Me.RibbonPageGroup1.Name = "RibbonPageGroup1" + Me.RibbonPageGroup1.Text = "RibbonPageGroup1" + ' + 'RibbonStatusBar1 + ' + Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticItem1) + Me.RibbonStatusBar1.ItemLinks.Add(Me.labelResult) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 309) + Me.RibbonStatusBar1.Name = "RibbonStatusBar1" + Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 + Me.RibbonStatusBar1.Size = New System.Drawing.Size(511, 22) + ' + 'RibbonPage2 + ' + Me.RibbonPage2.Name = "RibbonPage2" + Me.RibbonPage2.Text = "RibbonPage2" + ' + 'labelResult + ' + Me.labelResult.Caption = "" + Me.labelResult.Id = 5 + Me.labelResult.Name = "labelResult" + ' 'frmRegexEditor ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(429, 235) - Me.Controls.Add(Me.btnTest) - Me.Controls.Add(Me.btnSave) - Me.Controls.Add(Me.labelResult) - Me.Controls.Add(Me.Label3) + Me.ClientSize = New System.Drawing.Size(511, 331) Me.Controls.Add(Me.Label2) Me.Controls.Add(Me.txtTest) Me.Controls.Add(Me.Label4) Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.txtRegex) - Me.IconOptions.ShowIcon = False + Me.Controls.Add(Me.RibbonStatusBar1) + Me.Controls.Add(Me.RibbonControl1) + Me.IconOptions.SvgImage = Global.DigitalData.Controls.RegexEditor.My.Resources.Resources.definednameuseinformula2 Me.Name = "frmRegexEditor" + Me.Ribbon = Me.RibbonControl1 + Me.StatusBar = Me.RibbonStatusBar1 Me.Text = "Regex Editor" + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() End Sub - - Friend WithEvents btnTest As Button - Friend WithEvents btnSave As Button - Friend WithEvents labelResult As Label - Friend WithEvents Label3 As Label Friend WithEvents Label2 As Label Friend WithEvents txtTest As TextBox Friend WithEvents Label4 As Label Friend WithEvents Label1 As Label Friend WithEvents txtRegex As TextBox + Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl + Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar + Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarStaticItem1 As DevExpress.XtraBars.BarStaticItem + Friend WithEvents labelResult As DevExpress.XtraBars.BarStaticItem End Class diff --git a/Controls.RegexEditor/frmRegexEditor.vb b/Controls.RegexEditor/frmRegexEditor.vb index 761ac9a9..687d9104 100644 --- a/Controls.RegexEditor/frmRegexEditor.vb +++ b/Controls.RegexEditor/frmRegexEditor.vb @@ -4,6 +4,8 @@ Public Class frmRegexEditor Public RegexString As String Public Sub New(RegexString As String) + MyBase.New() + ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() @@ -15,21 +17,22 @@ Public Class frmRegexEditor txtRegex.Text = RegexString End Sub - Private Sub btnTest_Click(sender As Object, e As EventArgs) Handles btnTest.Click + Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + RegexString = txtRegex.Text + Close() + End Sub + + Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick Try Dim oTestString As String = txtTest.Text If Regex.IsMatch(oTestString, txtRegex.Text) Then - labelResult.Text = "Test String ist gültig." + labelResult.Caption = "Test String ist gültig." Else - labelResult.Text = "Test String ist nicht gültig." + labelResult.Caption = "Test String ist nicht gültig." End If Catch ex As Exception MsgBox(ex.Message, MsgBoxStyle.Critical, "Regex Test") End Try End Sub - - Private Sub btnSave_Click(sender As Object, e As EventArgs) Handles btnSave.Click - RegexString = txtRegex.Text - End Sub End Class \ No newline at end of file From cc2a0e593653e9a8ce6544b44c884560da51832e Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 19 Apr 2021 16:30:00 +0200 Subject: [PATCH 33/82] SQLEditor: New Module --- Controls.RegexEditor/frmRegexEditor.vb | 1 + Controls.SQLEditor/App.config | 6 + .../My Project/Application.Designer.vb | 13 + .../My Project/Application.myapp | 10 + Controls.SQLEditor/My Project/AssemblyInfo.vb | 35 +++ .../My Project/Resources.Designer.vb | 83 ++++++ Controls.SQLEditor/My Project/Resources.resx | 127 ++++++++++ .../My Project/Settings.Designer.vb | 73 ++++++ .../My Project/Settings.settings | 7 + Controls.SQLEditor/My Project/licenses.licx | 5 + .../Resources/actions_check.svg | 15 ++ .../Resources/updatedataextract.svg | 16 ++ Controls.SQLEditor/SQLEditor.vbproj | 139 ++++++++++ Controls.SQLEditor/frmSQLEditor.Designer.vb | 239 ++++++++++++++++++ Controls.SQLEditor/frmSQLEditor.resx | 120 +++++++++ Controls.SQLEditor/frmSQLEditor.vb | 31 +++ DDMonorepo.sln | 7 + 17 files changed, 927 insertions(+) create mode 100644 Controls.SQLEditor/App.config create mode 100644 Controls.SQLEditor/My Project/Application.Designer.vb create mode 100644 Controls.SQLEditor/My Project/Application.myapp create mode 100644 Controls.SQLEditor/My Project/AssemblyInfo.vb create mode 100644 Controls.SQLEditor/My Project/Resources.Designer.vb create mode 100644 Controls.SQLEditor/My Project/Resources.resx create mode 100644 Controls.SQLEditor/My Project/Settings.Designer.vb create mode 100644 Controls.SQLEditor/My Project/Settings.settings create mode 100644 Controls.SQLEditor/My Project/licenses.licx create mode 100644 Controls.SQLEditor/Resources/actions_check.svg create mode 100644 Controls.SQLEditor/Resources/updatedataextract.svg create mode 100644 Controls.SQLEditor/SQLEditor.vbproj create mode 100644 Controls.SQLEditor/frmSQLEditor.Designer.vb create mode 100644 Controls.SQLEditor/frmSQLEditor.resx create mode 100644 Controls.SQLEditor/frmSQLEditor.vb diff --git a/Controls.RegexEditor/frmRegexEditor.vb b/Controls.RegexEditor/frmRegexEditor.vb index 687d9104..0b5b6c9c 100644 --- a/Controls.RegexEditor/frmRegexEditor.vb +++ b/Controls.RegexEditor/frmRegexEditor.vb @@ -19,6 +19,7 @@ Public Class frmRegexEditor Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick RegexString = txtRegex.Text + DialogResult = DialogResult.OK Close() End Sub diff --git a/Controls.SQLEditor/App.config b/Controls.SQLEditor/App.config new file mode 100644 index 00000000..5534e287 --- /dev/null +++ b/Controls.SQLEditor/App.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Controls.SQLEditor/My Project/Application.Designer.vb b/Controls.SQLEditor/My Project/Application.Designer.vb new file mode 100644 index 00000000..8ab460ba --- /dev/null +++ b/Controls.SQLEditor/My Project/Application.Designer.vb @@ -0,0 +1,13 @@ +'------------------------------------------------------------------------------ +' +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 +' +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + diff --git a/Controls.SQLEditor/My Project/Application.myapp b/Controls.SQLEditor/My Project/Application.myapp new file mode 100644 index 00000000..60a8aa77 --- /dev/null +++ b/Controls.SQLEditor/My Project/Application.myapp @@ -0,0 +1,10 @@ + + + true + frmSQLEditor + false + 0 + true + 0 + true + \ No newline at end of file diff --git a/Controls.SQLEditor/My Project/AssemblyInfo.vb b/Controls.SQLEditor/My Project/AssemblyInfo.vb new file mode 100644 index 00000000..888eed47 --- /dev/null +++ b/Controls.SQLEditor/My Project/AssemblyInfo.vb @@ -0,0 +1,35 @@ +Imports System +Imports System.Reflection +Imports System.Runtime.InteropServices + +' Allgemeine Informationen über eine Assembly werden über die folgenden +' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, +' die einer Assembly zugeordnet sind. + +' Werte der Assemblyattribute überprüfen + + + + + + + + + + +'Die folgende GUID wird für die typelib-ID verwendet, wenn dieses Projekt für COM verfügbar gemacht wird. + + +' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: +' +' Hauptversion +' Nebenversion +' Buildnummer +' Revision +' +' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, +' indem Sie "*" wie unten gezeigt eingeben: +' + + + diff --git a/Controls.SQLEditor/My Project/Resources.Designer.vb b/Controls.SQLEditor/My Project/Resources.Designer.vb new file mode 100644 index 00000000..bf1b5f1d --- /dev/null +++ b/Controls.SQLEditor/My Project/Resources.Designer.vb @@ -0,0 +1,83 @@ +'------------------------------------------------------------------------------ +' +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 +' +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + +Imports System + +Namespace My.Resources + + 'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert + '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. + 'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen + 'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. + ''' + ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. + ''' + _ + Friend Module Resources + + Private resourceMan As Global.System.Resources.ResourceManager + + Private resourceCulture As Global.System.Globalization.CultureInfo + + ''' + ''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. + ''' + _ + Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager + Get + If Object.ReferenceEquals(resourceMan, Nothing) Then + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DigitalData.Controls.SQLEditor.Resources", GetType(Resources).Assembly) + resourceMan = temp + End If + Return resourceMan + End Get + End Property + + ''' + ''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + ''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. + ''' + _ + Friend Property Culture() As Global.System.Globalization.CultureInfo + Get + Return resourceCulture + End Get + Set + resourceCulture = value + End Set + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property actions_check() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("actions_check", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property updatedataextract() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("updatedataextract", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + End Module +End Namespace diff --git a/Controls.SQLEditor/My Project/Resources.resx b/Controls.SQLEditor/My Project/Resources.resx new file mode 100644 index 00000000..37f04f67 --- /dev/null +++ b/Controls.SQLEditor/My Project/Resources.resx @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + ..\Resources\actions_check.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\updatedataextract.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + \ No newline at end of file diff --git a/Controls.SQLEditor/My Project/Settings.Designer.vb b/Controls.SQLEditor/My Project/Settings.Designer.vb new file mode 100644 index 00000000..494381b8 --- /dev/null +++ b/Controls.SQLEditor/My Project/Settings.Designer.vb @@ -0,0 +1,73 @@ +'------------------------------------------------------------------------------ +' +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 +' +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + + +Namespace My + + _ + Partial Friend NotInheritable Class MySettings + Inherits Global.System.Configuration.ApplicationSettingsBase + + Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) + +#Region "Automatische My.Settings-Speicherfunktion" +#If _MyType = "WindowsForms" Then + Private Shared addedHandler As Boolean + + Private Shared addedHandlerLockObject As New Object + + _ + Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs) + If My.Application.SaveMySettingsOnExit Then + My.Settings.Save() + End If + End Sub +#End If +#End Region + + Public Shared ReadOnly Property [Default]() As MySettings + Get + +#If _MyType = "WindowsForms" Then + If Not addedHandler Then + SyncLock addedHandlerLockObject + If Not addedHandler Then + AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings + addedHandler = True + End If + End SyncLock + End If +#End If + Return defaultInstance + End Get + End Property + End Class +End Namespace + +Namespace My + + _ + Friend Module MySettingsProperty + + _ + Friend ReadOnly Property Settings() As Global.DigitalData.Controls.SQLEditor.My.MySettings + Get + Return Global.DigitalData.Controls.SQLEditor.My.MySettings.Default + End Get + End Property + End Module +End Namespace diff --git a/Controls.SQLEditor/My Project/Settings.settings b/Controls.SQLEditor/My Project/Settings.settings new file mode 100644 index 00000000..85b890b3 --- /dev/null +++ b/Controls.SQLEditor/My Project/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + diff --git a/Controls.SQLEditor/My Project/licenses.licx b/Controls.SQLEditor/My Project/licenses.licx new file mode 100644 index 00000000..69af2f77 --- /dev/null +++ b/Controls.SQLEditor/My Project/licenses.licx @@ -0,0 +1,5 @@ +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.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.XtraBars.Ribbon.RibbonControl, 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.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/Controls.SQLEditor/Resources/actions_check.svg b/Controls.SQLEditor/Resources/actions_check.svg new file mode 100644 index 00000000..35c68028 --- /dev/null +++ b/Controls.SQLEditor/Resources/actions_check.svg @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/Controls.SQLEditor/Resources/updatedataextract.svg b/Controls.SQLEditor/Resources/updatedataextract.svg new file mode 100644 index 00000000..e7dda038 --- /dev/null +++ b/Controls.SQLEditor/Resources/updatedataextract.svg @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/Controls.SQLEditor/SQLEditor.vbproj b/Controls.SQLEditor/SQLEditor.vbproj new file mode 100644 index 00000000..67eca49f --- /dev/null +++ b/Controls.SQLEditor/SQLEditor.vbproj @@ -0,0 +1,139 @@ + + + + + Debug + AnyCPU + {3E7BC8A9-91EF-49B8-8110-2C01F664C24A} + Library + + + DigitalData.Controls.SQLEditor + DigitalData.Controls.SQLEditor + 512 + Windows + v4.6.1 + true + true + + + AnyCPU + true + full + true + true + bin\Debug\ + DigitalData.Controls.SQLEditor.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + + + AnyCPU + pdbonly + false + true + true + bin\Release\ + DigitalData.Controls.SQLEditor.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + + + On + + + Binary + + + Off + + + On + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + frmSQLEditor.vb + + + Form + + + + True + Application.myapp + True + + + True + True + Resources.resx + + + True + Settings.settings + True + + + + + frmSQLEditor.vb + + + + VbMyResourcesResXFileCodeGenerator + Resources.Designer.vb + My.Resources + Designer + + + + + MyApplicationCodeGenerator + Application.Designer.vb + + + SettingsSingleFileGenerator + My + Settings.Designer.vb + + + + + + + + + + + \ No newline at end of file diff --git a/Controls.SQLEditor/frmSQLEditor.Designer.vb b/Controls.SQLEditor/frmSQLEditor.Designer.vb new file mode 100644 index 00000000..decfe1a5 --- /dev/null +++ b/Controls.SQLEditor/frmSQLEditor.Designer.vb @@ -0,0 +1,239 @@ + +Partial Class frmSQLEditor + Inherits DevExpress.XtraBars.Ribbon.RibbonForm + + 'Form overrides dispose to clean up the component list. + + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + MyBase.Dispose(disposing) + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + + Private Sub InitializeComponent() + Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() + Me.GridControl1 = New DevExpress.XtraGrid.GridControl() + Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() + Me.txtSQL = New DevExpress.XtraEditors.MemoEdit() + Me.ComboBoxEdit1 = New DevExpress.XtraEditors.ComboBoxEdit() + Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() + Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() + Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() + CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.LayoutControl1.SuspendLayout() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtSQL.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'LayoutControl1 + ' + Me.LayoutControl1.Controls.Add(Me.GridControl1) + Me.LayoutControl1.Controls.Add(Me.txtSQL) + 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.Name = "LayoutControl1" + Me.LayoutControl1.Root = Me.Root + Me.LayoutControl1.Size = New System.Drawing.Size(918, 450) + Me.LayoutControl1.TabIndex = 0 + Me.LayoutControl1.Text = "LayoutControl1" + ' + 'GridControl1 + ' + Me.GridControl1.Location = New System.Drawing.Point(460, 12) + Me.GridControl1.MainView = Me.GridView1 + Me.GridControl1.MenuManager = Me.RibbonControl1 + Me.GridControl1.Name = "GridControl1" + Me.GridControl1.Size = New System.Drawing.Size(446, 426) + Me.GridControl1.TabIndex = 5 + Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) + ' + 'GridView1 + ' + Me.GridView1.GridControl = Me.GridControl1 + Me.GridView1.Name = "GridView1" + ' + 'RibbonControl1 + ' + Me.RibbonControl1.CommandLayout = DevExpress.XtraBars.Ribbon.CommandLayout.Simplified + Me.RibbonControl1.ExpandCollapseItem.Id = 0 + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2}) + Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) + Me.RibbonControl1.MaxItemId = 3 + Me.RibbonControl1.Name = "RibbonControl1" + 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.ShowToolbarCustomizeItem = False + Me.RibbonControl1.Size = New System.Drawing.Size(918, 66) + Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 + Me.RibbonControl1.Toolbar.ShowCustomizeItem = False + ' + 'BarButtonItem1 + ' + Me.BarButtonItem1.Caption = "Speichern und schließen" + Me.BarButtonItem1.Id = 1 + Me.BarButtonItem1.ImageOptions.SvgImage = Global.DigitalData.Controls.SQLEditor.My.Resources.Resources.actions_check + Me.BarButtonItem1.Name = "BarButtonItem1" + ' + 'BarButtonItem2 + ' + Me.BarButtonItem2.Caption = "SQL testen" + Me.BarButtonItem2.Id = 2 + Me.BarButtonItem2.ImageOptions.SvgImage = Global.DigitalData.Controls.SQLEditor.My.Resources.Resources.updatedataextract + Me.BarButtonItem2.Name = "BarButtonItem2" + ' + 'RibbonPage1 + ' + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) + Me.RibbonPage1.Name = "RibbonPage1" + Me.RibbonPage1.Text = "RibbonPage1" + ' + 'RibbonPageGroup1 + ' + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2) + Me.RibbonPageGroup1.Name = "RibbonPageGroup1" + Me.RibbonPageGroup1.Text = "RibbonPageGroup1" + ' + 'RibbonStatusBar1 + ' + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 516) + Me.RibbonStatusBar1.Name = "RibbonStatusBar1" + Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 + Me.RibbonStatusBar1.Size = New System.Drawing.Size(918, 22) + ' + 'txtSQL + ' + Me.txtSQL.Location = New System.Drawing.Point(15, 77) + Me.txtSQL.MenuManager = Me.RibbonControl1 + Me.txtSQL.Name = "txtSQL" + Me.txtSQL.Properties.Appearance.Font = New System.Drawing.Font("Consolas", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtSQL.Properties.Appearance.Options.UseFont = True + Me.txtSQL.Size = New System.Drawing.Size(438, 358) + Me.txtSQL.StyleController = Me.LayoutControl1 + Me.txtSQL.TabIndex = 4 + ' + 'ComboBoxEdit1 + ' + Me.ComboBoxEdit1.Location = New System.Drawing.Point(15, 31) + Me.ComboBoxEdit1.MenuManager = Me.RibbonControl1 + Me.ComboBoxEdit1.Name = "ComboBoxEdit1" + Me.ComboBoxEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.ComboBoxEdit1.Size = New System.Drawing.Size(438, 20) + Me.ComboBoxEdit1.StyleController = Me.LayoutControl1 + Me.ComboBoxEdit1.TabIndex = 6 + ' + 'Root + ' + Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] + Me.Root.GroupBordersVisible = False + Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.LayoutControlItem3}) + Me.Root.Name = "Root" + Me.Root.Size = New System.Drawing.Size(918, 450) + Me.Root.TextVisible = False + ' + 'LayoutControlItem1 + ' + Me.LayoutControlItem1.Control = Me.txtSQL + Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 46) + Me.LayoutControlItem1.Name = "LayoutControlItem1" + Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem1.Size = New System.Drawing.Size(448, 384) + Me.LayoutControlItem1.Text = "SQL Abfrage" + Me.LayoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(84, 13) + ' + 'LayoutControlItem2 + ' + Me.LayoutControlItem2.Control = Me.GridControl1 + Me.LayoutControlItem2.Location = New System.Drawing.Point(448, 0) + Me.LayoutControlItem2.Name = "LayoutControlItem2" + Me.LayoutControlItem2.Size = New System.Drawing.Size(450, 430) + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem2.TextVisible = False + ' + 'LayoutControlItem3 + ' + Me.LayoutControlItem3.Control = Me.ComboBoxEdit1 + Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlItem3.Name = "LayoutControlItem3" + Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem3.Size = New System.Drawing.Size(448, 46) + Me.LayoutControlItem3.Text = "SQL Verbindung" + Me.LayoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(84, 13) + ' + 'RibbonPage2 + ' + Me.RibbonPage2.Name = "RibbonPage2" + Me.RibbonPage2.Text = "RibbonPage2" + ' + 'frmSQLEditor + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(918, 538) + Me.Controls.Add(Me.LayoutControl1) + Me.Controls.Add(Me.RibbonStatusBar1) + Me.Controls.Add(Me.RibbonControl1) + Me.Name = "frmSQLEditor" + Me.Ribbon = Me.RibbonControl1 + Me.StatusBar = Me.RibbonStatusBar1 + Me.Text = "frmSQLEditor" + CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.LayoutControl1.ResumeLayout(False) + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtSQL.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl + Friend WithEvents Root As DevExpress.XtraLayout.LayoutControlGroup + Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl + Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar + Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl + Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents txtSQL As DevExpress.XtraEditors.MemoEdit + Friend WithEvents LayoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents ComboBoxEdit1 As DevExpress.XtraEditors.ComboBoxEdit + Friend WithEvents LayoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem +End Class diff --git a/Controls.SQLEditor/frmSQLEditor.resx b/Controls.SQLEditor/frmSQLEditor.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/Controls.SQLEditor/frmSQLEditor.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Controls.SQLEditor/frmSQLEditor.vb b/Controls.SQLEditor/frmSQLEditor.vb new file mode 100644 index 00000000..9b01b7a3 --- /dev/null +++ b/Controls.SQLEditor/frmSQLEditor.vb @@ -0,0 +1,31 @@ +Public Class frmSQLEditor + Public SQLString As String + + Public Sub New(SQLString As String) + MyBase.New() + + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + Me.SQLString = SQLString + End Sub + + Private Sub RegexEditor_Load(sender As Object, e As EventArgs) Handles MyBase.Load + txtSQL.Text = SQLString + End Sub + + Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + SQLString = txtSQL.Text + DialogResult = DialogResult.OK + Close() + End Sub + + Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick + Try + MsgBox("TODO: Test SQL", MsgBoxStyle.Exclamation, Text) + Catch ex As Exception + MsgBox(ex.Message, MsgBoxStyle.Critical, "Regex Test") + End Try + End Sub +End Class \ No newline at end of file diff --git a/DDMonorepo.sln b/DDMonorepo.sln index f774b72f..38a35eba 100644 --- a/DDMonorepo.sln +++ b/DDMonorepo.sln @@ -126,6 +126,8 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMI.File.Test", "Modules.E EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "GlobalIndexer", "GUIs.GlobalIndexer\GlobalIndexer.vbproj", "{40384B94-1F94-4249-9A5A-D02E0B346738}" EndProject +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "SQLEditor", "Controls.SQLEditor\SQLEditor.vbproj", "{3E7BC8A9-91EF-49B8-8110-2C01F664C24A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -332,6 +334,10 @@ Global {40384B94-1F94-4249-9A5A-D02E0B346738}.Debug|Any CPU.Build.0 = Debug|Any CPU {40384B94-1F94-4249-9A5A-D02E0B346738}.Release|Any CPU.ActiveCfg = Release|Any CPU {40384B94-1F94-4249-9A5A-D02E0B346738}.Release|Any CPU.Build.0 = Release|Any CPU + {3E7BC8A9-91EF-49B8-8110-2C01F664C24A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3E7BC8A9-91EF-49B8-8110-2C01F664C24A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3E7BC8A9-91EF-49B8-8110-2C01F664C24A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3E7BC8A9-91EF-49B8-8110-2C01F664C24A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -387,6 +393,7 @@ Global {1477032D-7A02-4C5F-B026-A7117DA4BC6B} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} {16857A4E-2609-47E6-9C35-7669D64DD040} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} {40384B94-1F94-4249-9A5A-D02E0B346738} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB} + {3E7BC8A9-91EF-49B8-8110-2C01F664C24A} = {F98C0329-C004-417F-B2AB-7466E88D8220} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C1BE4090-A0FD-48AF-86CB-39099D14B286} From 764adc712360da09209232e1aebbcee5810477b6 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 19 Apr 2021 16:30:15 +0200 Subject: [PATCH 34/82] Common: Add GridBuilder --- GUIs.Common/Common.vbproj | 1 + GUIs.Common/GridBuilder.vb | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 GUIs.Common/GridBuilder.vb diff --git a/GUIs.Common/Common.vbproj b/GUIs.Common/Common.vbproj index 230330ad..33c6ff7d 100644 --- a/GUIs.Common/Common.vbproj +++ b/GUIs.Common/Common.vbproj @@ -114,6 +114,7 @@ Form + diff --git a/GUIs.Common/GridBuilder.vb b/GUIs.Common/GridBuilder.vb new file mode 100644 index 00000000..87da002f --- /dev/null +++ b/GUIs.Common/GridBuilder.vb @@ -0,0 +1,32 @@ +Imports DevExpress.XtraGrid +Imports DevExpress.XtraGrid.Views.Grid + +Public Class GridBuilder + Public ReadOnly Property Views As New List(Of GridView) + + Public Sub New(GridView As GridView) + Views.Add(GridView) + End Sub + + Public Sub New(GridViews As List(Of GridView)) + Views.AddRange(GridViews) + End Sub + + Public Function WithDefaults() As GridBuilder + For Each oView In Views + oView.OptionsView.EnableAppearanceEvenRow = True + oView.OptionsView.ShowAutoFilterRow = True + Next + + Return Me + End Function + + Public Function WithReadOnlyOptions() As GridBuilder + For Each oView In Views + oView.OptionsBehavior.Editable = False + oView.OptionsBehavior.ReadOnly = True + Next + + Return Me + End Function +End Class From df2593edd816b81394c227d27d93e6ff9f382ee6 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 19 Apr 2021 16:30:32 +0200 Subject: [PATCH 35/82] ZooFlow: WIP CW Admin --- .../frmAdmin_CWProfile.Designer.vb | 737 +++- .../Administration/frmAdmin_CWProfile.resx | 12 + .../Administration/frmAdmin_CWProfile.vb | 100 +- GUIs.ZooFlow/DBCW_Stammdaten.Designer.vb | 3338 +++++++++++++++-- GUIs.ZooFlow/DBCW_Stammdaten.xsd | 317 +- GUIs.ZooFlow/DBCW_Stammdaten.xss | 31 +- .../frmGlobixAdministration.Designer.vb | 120 +- .../Globix/frmGlobixAdministration.resx | 58 +- GUIs.ZooFlow/My Project/Resources.Designer.vb | 110 + GUIs.ZooFlow/My Project/Resources.resx | 109 +- GUIs.ZooFlow/Resources/actions_database.svg | 17 + .../Resources/actions_deletecircled6.svg | 15 + GUIs.ZooFlow/Resources/actions_window.svg | 16 + .../Resources/definednameuseinformula1.svg | 9 + .../Resources/definednameuseinformula2.svg | 9 + GUIs.ZooFlow/Resources/del4.svg | 4 + GUIs.ZooFlow/Resources/documentproperties.svg | 9 + GUIs.ZooFlow/Resources/pagesetup.svg | 18 + GUIs.ZooFlow/Resources/pagesetup1.svg | 18 + GUIs.ZooFlow/Resources/singlepageview.svg | 16 + GUIs.ZooFlow/Resources/windows.svg | 18 + GUIs.ZooFlow/ZooFlow.vbproj | 48 +- 22 files changed, 4549 insertions(+), 580 deletions(-) create mode 100644 GUIs.ZooFlow/Resources/actions_database.svg create mode 100644 GUIs.ZooFlow/Resources/actions_deletecircled6.svg create mode 100644 GUIs.ZooFlow/Resources/actions_window.svg create mode 100644 GUIs.ZooFlow/Resources/definednameuseinformula1.svg create mode 100644 GUIs.ZooFlow/Resources/definednameuseinformula2.svg create mode 100644 GUIs.ZooFlow/Resources/del4.svg create mode 100644 GUIs.ZooFlow/Resources/documentproperties.svg create mode 100644 GUIs.ZooFlow/Resources/pagesetup.svg create mode 100644 GUIs.ZooFlow/Resources/pagesetup1.svg create mode 100644 GUIs.ZooFlow/Resources/singlepageview.svg create mode 100644 GUIs.ZooFlow/Resources/windows.svg diff --git a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb index 8a0c16c3..09e9a42a 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb @@ -23,11 +23,27 @@ Partial Class frmAdmin_CWProfile Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() + Dim EditorButtonImageOptions1 As DevExpress.XtraEditors.Controls.EditorButtonImageOptions = New DevExpress.XtraEditors.Controls.EditorButtonImageOptions() + Dim SerializableAppearanceObject1 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject2 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject3 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject4 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim EditorButtonImageOptions2 As DevExpress.XtraEditors.Controls.EditorButtonImageOptions = New DevExpress.XtraEditors.Controls.EditorButtonImageOptions() + Dim SerializableAppearanceObject5 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject6 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject7 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject8 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim EditorButtonImageOptions3 As DevExpress.XtraEditors.Controls.EditorButtonImageOptions = New DevExpress.XtraEditors.Controls.EditorButtonImageOptions() + Dim SerializableAppearanceObject9 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject10 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject11 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject12 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() Me.labelStatus = New DevExpress.XtraBars.BarStaticItem() Me.labelError = New DevExpress.XtraBars.BarStaticItem() + Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() @@ -45,9 +61,7 @@ Partial Class frmAdmin_CWProfile Me.txtChangedWho = New DevExpress.XtraEditors.TextEdit() Me.txtChangedWhen = New DevExpress.XtraEditors.TextEdit() Me.CheckEdit1 = New DevExpress.XtraEditors.CheckEdit() - Me.TextEdit4 = New DevExpress.XtraEditors.TextEdit() - Me.TextEdit5 = New DevExpress.XtraEditors.TextEdit() - Me.SimpleButton1 = New DevExpress.XtraEditors.SimpleButton() + Me.TextEdit4 = New DevExpress.XtraEditors.ButtonEdit() Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() @@ -55,12 +69,47 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem10 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem9 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem11 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() - Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() + Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() + Me.PageProfile = New DevExpress.XtraTab.XtraTabPage() + Me.XtraTabControl2 = New DevExpress.XtraTab.XtraTabControl() + Me.PageDocumentSearch = New DevExpress.XtraTab.XtraTabPage() + Me.LayoutControl2 = New DevExpress.XtraLayout.LayoutControl() + Me.TextEdit5 = New DevExpress.XtraEditors.TextEdit() + Me.TBCW_PROF_DOC_SEARCHBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.TextEdit6 = New DevExpress.XtraEditors.TextEdit() + Me.CheckEdit2 = New DevExpress.XtraEditors.CheckEdit() + Me.ComboBoxEdit1 = New DevExpress.XtraEditors.ComboBoxEdit() + Me.TextEdit7 = New DevExpress.XtraEditors.ButtonEdit() + Me.TextEdit8 = New DevExpress.XtraEditors.ButtonEdit() + Me.txtAddedWho1 = New DevExpress.XtraEditors.TextEdit() + Me.txtChangedWho1 = New DevExpress.XtraEditors.TextEdit() + Me.txtAddedWhen1 = New DevExpress.XtraEditors.TextEdit() + Me.txtChangedWhen1 = New DevExpress.XtraEditors.TextEdit() + Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup() + Me.LayoutControlItem10 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem11 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem13 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem12 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem14 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem15 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem16 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem17 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem18 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem19 = New DevExpress.XtraLayout.LayoutControlItem() + Me.GridControl2 = New DevExpress.XtraGrid.GridControl() + Me.GridViewDocSearch = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.colTAB_TITLE1 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.PageDataSearch = New DevExpress.XtraTab.XtraTabPage() + Me.GridControl1 = New DevExpress.XtraGrid.GridControl() + Me.TBCW_PROF_DATA_SEARCHBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.GridViewDataSearch = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.colTAB_TITLE = New DevExpress.XtraGrid.Columns.GridColumn() + Me.PageApplicationAssignment = New DevExpress.XtraTab.XtraTabPage() + Me.TBCW_PROF_DOC_SEARCHTableAdapter = New DigitalData.GUIs.ZooFlow.DBCW_StammdatenTableAdapters.TBCW_PROF_DOC_SEARCHTableAdapter() + Me.TBCW_PROF_DATA_SEARCHTableAdapter = New DigitalData.GUIs.ZooFlow.DBCW_StammdatenTableAdapters.TBCW_PROF_DATA_SEARCHTableAdapter() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DBCW_Stammdaten, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBCW_PROFILESBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() @@ -75,7 +124,6 @@ Partial Class frmAdmin_CWProfile CType(Me.txtChangedWhen.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.CheckEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit4.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TextEdit5.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() @@ -83,11 +131,45 @@ Partial Class frmAdmin_CWProfile CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.XtraTabControl1.SuspendLayout() + Me.PageProfile.SuspendLayout() + CType(Me.XtraTabControl2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.XtraTabControl2.SuspendLayout() + Me.PageDocumentSearch.SuspendLayout() + CType(Me.LayoutControl2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.LayoutControl2.SuspendLayout() + CType(Me.TextEdit5.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TBCW_PROF_DOC_SEARCHBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextEdit6.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.CheckEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextEdit7.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextEdit8.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtAddedWho1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtChangedWho1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtAddedWhen1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtChangedWhen1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem13, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem12, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem14, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem15, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem16, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem17, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem18, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem19, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridViewDocSearch, System.ComponentModel.ISupportInitialize).BeginInit() + Me.PageDataSearch.SuspendLayout() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TBCW_PROF_DATA_SEARCHBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridViewDataSearch, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'RibbonControl1 @@ -102,7 +184,7 @@ Partial Class frmAdmin_CWProfile Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide Me.RibbonControl1.ShowToolbarCustomizeItem = False - Me.RibbonControl1.Size = New System.Drawing.Size(800, 66) + Me.RibbonControl1.Size = New System.Drawing.Size(1328, 66) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 Me.RibbonControl1.Toolbar.ShowCustomizeItem = False ' @@ -136,6 +218,13 @@ Partial Class frmAdmin_CWProfile Me.labelError.Name = "labelError" Me.labelError.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing ' + 'BarButtonItem3 + ' + Me.BarButtonItem3.Caption = "Löschen" + Me.BarButtonItem3.Id = 5 + Me.BarButtonItem3.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_deletecircled6 + Me.BarButtonItem3.Name = "BarButtonItem3" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) @@ -154,10 +243,10 @@ Partial Class frmAdmin_CWProfile ' Me.RibbonStatusBar1.ItemLinks.Add(Me.labelStatus) Me.RibbonStatusBar1.ItemLinks.Add(Me.labelError) - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 428) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 676) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(800, 22) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1328, 22) ' 'RibbonPage2 ' @@ -181,6 +270,8 @@ Partial Class frmAdmin_CWProfile 'TableAdapterManager ' Me.TableAdapterManager.BackupDataSetBeforeUpdate = False + Me.TableAdapterManager.TBCW_PROF_DATA_SEARCHTableAdapter = Nothing + Me.TableAdapterManager.TBCW_PROF_DOC_SEARCHTableAdapter = Nothing Me.TableAdapterManager.TBCW_PROFILESTableAdapter = Me.TBCW_PROFILESTableAdapter Me.TableAdapterManager.UpdateOrder = DigitalData.GUIs.ZooFlow.DBCW_StammdatenTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' @@ -195,234 +286,198 @@ Partial Class frmAdmin_CWProfile Me.LayoutControl1.Controls.Add(Me.txtChangedWhen) Me.LayoutControl1.Controls.Add(Me.CheckEdit1) Me.LayoutControl1.Controls.Add(Me.TextEdit4) - Me.LayoutControl1.Controls.Add(Me.TextEdit5) - Me.LayoutControl1.Controls.Add(Me.SimpleButton1) - Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.LayoutControl1.Location = New System.Drawing.Point(0, 66) + Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Top + Me.LayoutControl1.Location = New System.Drawing.Point(0, 0) Me.LayoutControl1.Name = "LayoutControl1" Me.LayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(848, 159, 650, 400) Me.LayoutControl1.Root = Me.Root - Me.LayoutControl1.Size = New System.Drawing.Size(800, 362) + Me.LayoutControl1.Size = New System.Drawing.Size(1326, 252) Me.LayoutControl1.TabIndex = 2 Me.LayoutControl1.Text = "LayoutControl1" ' 'TextEdit1 ' Me.TextEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "GUID", True)) - Me.TextEdit1.Location = New System.Drawing.Point(145, 20) + Me.TextEdit1.Location = New System.Drawing.Point(116, 15) Me.TextEdit1.MenuManager = Me.RibbonControl1 Me.TextEdit1.Name = "TextEdit1" - Me.TextEdit1.Size = New System.Drawing.Size(245, 20) + Me.TextEdit1.Size = New System.Drawing.Size(540, 20) Me.TextEdit1.StyleController = Me.LayoutControl1 Me.TextEdit1.TabIndex = 4 ' 'TextEdit2 ' Me.TextEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "NAME", True)) - Me.TextEdit2.Location = New System.Drawing.Point(145, 60) + Me.TextEdit2.Location = New System.Drawing.Point(116, 45) Me.TextEdit2.MenuManager = Me.RibbonControl1 Me.TextEdit2.Name = "TextEdit2" - Me.TextEdit2.Size = New System.Drawing.Size(635, 20) + Me.TextEdit2.Size = New System.Drawing.Size(1195, 20) Me.TextEdit2.StyleController = Me.LayoutControl1 Me.TextEdit2.TabIndex = 5 ' 'TextEdit3 ' Me.TextEdit3.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "COMMENT", True)) - Me.TextEdit3.Location = New System.Drawing.Point(145, 100) + Me.TextEdit3.Location = New System.Drawing.Point(116, 75) Me.TextEdit3.MenuManager = Me.RibbonControl1 Me.TextEdit3.Name = "TextEdit3" - Me.TextEdit3.Size = New System.Drawing.Size(635, 20) + Me.TextEdit3.Size = New System.Drawing.Size(1195, 20) Me.TextEdit3.StyleController = Me.LayoutControl1 Me.TextEdit3.TabIndex = 6 ' 'txtAddedWho ' Me.txtAddedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "ADDED_WHO", True)) - Me.txtAddedWho.Location = New System.Drawing.Point(145, 222) + Me.txtAddedWho.Location = New System.Drawing.Point(116, 137) Me.txtAddedWho.MenuManager = Me.RibbonControl1 Me.txtAddedWho.Name = "txtAddedWho" - Me.txtAddedWho.Size = New System.Drawing.Size(244, 20) + Me.txtAddedWho.Properties.ReadOnly = True + Me.txtAddedWho.Size = New System.Drawing.Size(540, 20) Me.txtAddedWho.StyleController = Me.LayoutControl1 Me.txtAddedWho.TabIndex = 7 ' 'txtAddedWhen ' Me.txtAddedWhen.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "CHANGED_WHO", True)) - Me.txtAddedWhen.Location = New System.Drawing.Point(534, 222) + Me.txtAddedWhen.Location = New System.Drawing.Point(767, 137) Me.txtAddedWhen.MenuManager = Me.RibbonControl1 Me.txtAddedWhen.Name = "txtAddedWhen" - Me.txtAddedWhen.Size = New System.Drawing.Size(246, 20) + Me.txtAddedWhen.Properties.ReadOnly = True + Me.txtAddedWhen.Size = New System.Drawing.Size(544, 20) Me.txtAddedWhen.StyleController = Me.LayoutControl1 Me.txtAddedWhen.TabIndex = 8 ' 'txtChangedWho ' Me.txtChangedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "ADDED_WHEN", True)) - Me.txtChangedWho.Location = New System.Drawing.Point(145, 262) + Me.txtChangedWho.Location = New System.Drawing.Point(116, 167) Me.txtChangedWho.MenuManager = Me.RibbonControl1 Me.txtChangedWho.Name = "txtChangedWho" - Me.txtChangedWho.Size = New System.Drawing.Size(244, 20) + Me.txtChangedWho.Properties.ReadOnly = True + Me.txtChangedWho.Size = New System.Drawing.Size(540, 20) Me.txtChangedWho.StyleController = Me.LayoutControl1 Me.txtChangedWho.TabIndex = 9 ' 'txtChangedWhen ' Me.txtChangedWhen.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "CHANGED_WHEN", True)) - Me.txtChangedWhen.Location = New System.Drawing.Point(534, 262) + Me.txtChangedWhen.Location = New System.Drawing.Point(767, 167) Me.txtChangedWhen.MenuManager = Me.RibbonControl1 Me.txtChangedWhen.Name = "txtChangedWhen" - Me.txtChangedWhen.Size = New System.Drawing.Size(246, 20) + Me.txtChangedWhen.Properties.ReadOnly = True + Me.txtChangedWhen.Size = New System.Drawing.Size(544, 20) Me.txtChangedWhen.StyleController = Me.LayoutControl1 Me.txtChangedWhen.TabIndex = 10 ' 'CheckEdit1 ' Me.CheckEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "ACTIVE", True)) - Me.CheckEdit1.Location = New System.Drawing.Point(410, 20) + Me.CheckEdit1.Location = New System.Drawing.Point(666, 15) Me.CheckEdit1.MenuManager = Me.RibbonControl1 Me.CheckEdit1.Name = "CheckEdit1" Me.CheckEdit1.Properties.Caption = "Aktiv" - Me.CheckEdit1.Size = New System.Drawing.Size(370, 18) + Me.CheckEdit1.Size = New System.Drawing.Size(645, 18) Me.CheckEdit1.StyleController = Me.LayoutControl1 Me.CheckEdit1.TabIndex = 11 ' 'TextEdit4 ' Me.TextEdit4.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "REGEX_EXPRESSION", True)) - Me.TextEdit4.Location = New System.Drawing.Point(145, 140) + Me.TextEdit4.Location = New System.Drawing.Point(116, 105) Me.TextEdit4.MenuManager = Me.RibbonControl1 Me.TextEdit4.Name = "TextEdit4" - Me.TextEdit4.Size = New System.Drawing.Size(635, 20) + EditorButtonImageOptions1.SvgImageSize = New System.Drawing.Size(16, 16) + Me.TextEdit4.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "Regex bearbeiten", -1, True, True, False, EditorButtonImageOptions1, New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), SerializableAppearanceObject1, SerializableAppearanceObject2, SerializableAppearanceObject3, SerializableAppearanceObject4, "", "BUTTON_REGEX_PROFILE", Nothing, DevExpress.Utils.ToolTipAnchor.[Default])}) + Me.TextEdit4.Size = New System.Drawing.Size(1195, 22) Me.TextEdit4.StyleController = Me.LayoutControl1 Me.TextEdit4.TabIndex = 12 ' - 'TextEdit5 - ' - Me.TextEdit5.Location = New System.Drawing.Point(145, 180) - Me.TextEdit5.MenuManager = Me.RibbonControl1 - Me.TextEdit5.Name = "TextEdit5" - Me.TextEdit5.Size = New System.Drawing.Size(434, 20) - Me.TextEdit5.StyleController = Me.LayoutControl1 - Me.TextEdit5.TabIndex = 13 - ' - 'SimpleButton1 - ' - Me.SimpleButton1.Location = New System.Drawing.Point(599, 180) - Me.SimpleButton1.Margin = New System.Windows.Forms.Padding(10) - Me.SimpleButton1.Name = "SimpleButton1" - Me.SimpleButton1.Size = New System.Drawing.Size(181, 22) - Me.SimpleButton1.StyleController = Me.LayoutControl1 - Me.SimpleButton1.TabIndex = 14 - Me.SimpleButton1.Text = "Regular Expression prüfen" - ' 'Root ' Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] Me.Root.GroupBordersVisible = False - Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem2, Me.LayoutControlItem3, Me.LayoutControlItem4, Me.LayoutControlItem6, Me.LayoutControlItem5, Me.LayoutControlItem7, Me.LayoutControlItem10, Me.LayoutControlItem9, Me.LayoutControlItem8, Me.LayoutControlItem1, Me.LayoutControlItem11}) + Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem2, Me.LayoutControlItem3, Me.LayoutControlItem4, Me.LayoutControlItem6, Me.LayoutControlItem5, Me.LayoutControlItem7, Me.LayoutControlItem9, Me.LayoutControlItem8, Me.LayoutControlItem1}) Me.Root.Name = "Root" - Me.Root.Size = New System.Drawing.Size(800, 362) + Me.Root.Size = New System.Drawing.Size(1326, 252) Me.Root.TextVisible = False ' 'LayoutControlItem2 ' Me.LayoutControlItem2.Control = Me.TextEdit2 - Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 40) + Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 30) Me.LayoutControlItem2.Name = "LayoutControlItem2" - Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem2.Size = New System.Drawing.Size(780, 40) + Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem2.Size = New System.Drawing.Size(1306, 30) Me.LayoutControlItem2.Text = "Profil" - Me.LayoutControlItem2.TextSize = New System.Drawing.Size(122, 13) + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(98, 13) ' 'LayoutControlItem3 ' Me.LayoutControlItem3.Control = Me.TextEdit3 - Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 80) + Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 60) Me.LayoutControlItem3.Name = "LayoutControlItem3" - Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem3.Size = New System.Drawing.Size(780, 40) + Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem3.Size = New System.Drawing.Size(1306, 30) Me.LayoutControlItem3.Text = "Kommentar" - Me.LayoutControlItem3.TextSize = New System.Drawing.Size(122, 13) + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(98, 13) ' 'LayoutControlItem4 ' Me.LayoutControlItem4.Control = Me.txtAddedWho - Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 202) + Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 122) Me.LayoutControlItem4.Name = "LayoutControlItem4" - Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem4.Size = New System.Drawing.Size(389, 40) + Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem4.Size = New System.Drawing.Size(651, 30) Me.LayoutControlItem4.Text = "Erstellt Wer" - Me.LayoutControlItem4.TextSize = New System.Drawing.Size(122, 13) + Me.LayoutControlItem4.TextSize = New System.Drawing.Size(98, 13) ' 'LayoutControlItem6 ' Me.LayoutControlItem6.Control = Me.txtChangedWho - Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 242) + Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 152) Me.LayoutControlItem6.Name = "LayoutControlItem6" - Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem6.Size = New System.Drawing.Size(389, 100) + Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem6.Size = New System.Drawing.Size(651, 80) Me.LayoutControlItem6.Text = "Geändert Wer" - Me.LayoutControlItem6.TextSize = New System.Drawing.Size(122, 13) + Me.LayoutControlItem6.TextSize = New System.Drawing.Size(98, 13) ' 'LayoutControlItem5 ' Me.LayoutControlItem5.Control = Me.txtAddedWhen - Me.LayoutControlItem5.Location = New System.Drawing.Point(389, 202) + Me.LayoutControlItem5.Location = New System.Drawing.Point(651, 122) Me.LayoutControlItem5.Name = "LayoutControlItem5" - Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem5.Size = New System.Drawing.Size(391, 40) + Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem5.Size = New System.Drawing.Size(655, 30) Me.LayoutControlItem5.Text = "Erstellt Wann" - Me.LayoutControlItem5.TextSize = New System.Drawing.Size(122, 13) + Me.LayoutControlItem5.TextSize = New System.Drawing.Size(98, 13) ' 'LayoutControlItem7 ' Me.LayoutControlItem7.Control = Me.txtChangedWhen - Me.LayoutControlItem7.Location = New System.Drawing.Point(389, 242) + Me.LayoutControlItem7.Location = New System.Drawing.Point(651, 152) Me.LayoutControlItem7.Name = "LayoutControlItem7" - Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem7.Size = New System.Drawing.Size(391, 100) + Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem7.Size = New System.Drawing.Size(655, 80) Me.LayoutControlItem7.Text = "Geändert Wann" - Me.LayoutControlItem7.TextSize = New System.Drawing.Size(122, 13) - ' - 'LayoutControlItem10 - ' - Me.LayoutControlItem10.Control = Me.TextEdit5 - Me.LayoutControlItem10.Location = New System.Drawing.Point(0, 160) - Me.LayoutControlItem10.Name = "LayoutControlItem10" - Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem10.Size = New System.Drawing.Size(579, 42) - Me.LayoutControlItem10.Text = "Regular Expression Test" - Me.LayoutControlItem10.TextSize = New System.Drawing.Size(122, 13) + Me.LayoutControlItem7.TextSize = New System.Drawing.Size(98, 13) ' 'LayoutControlItem9 ' Me.LayoutControlItem9.Control = Me.TextEdit4 - Me.LayoutControlItem9.Location = New System.Drawing.Point(0, 120) + Me.LayoutControlItem9.Location = New System.Drawing.Point(0, 90) Me.LayoutControlItem9.Name = "LayoutControlItem9" - Me.LayoutControlItem9.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem9.Size = New System.Drawing.Size(780, 40) + Me.LayoutControlItem9.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem9.Size = New System.Drawing.Size(1306, 32) Me.LayoutControlItem9.Text = "Regular Expression" - Me.LayoutControlItem9.TextSize = New System.Drawing.Size(122, 13) - ' - 'LayoutControlItem11 - ' - Me.LayoutControlItem11.Control = Me.SimpleButton1 - Me.LayoutControlItem11.Location = New System.Drawing.Point(579, 160) - Me.LayoutControlItem11.Name = "LayoutControlItem11" - Me.LayoutControlItem11.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem11.Size = New System.Drawing.Size(201, 42) - Me.LayoutControlItem11.Text = "Regular Expression prüfen" - Me.LayoutControlItem11.TextSize = New System.Drawing.Size(0, 0) - Me.LayoutControlItem11.TextVisible = False + Me.LayoutControlItem9.TextSize = New System.Drawing.Size(98, 13) ' 'LayoutControlItem8 ' Me.LayoutControlItem8.Control = Me.CheckEdit1 - Me.LayoutControlItem8.Location = New System.Drawing.Point(390, 0) + Me.LayoutControlItem8.Location = New System.Drawing.Point(651, 0) Me.LayoutControlItem8.Name = "LayoutControlItem8" - Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem8.Size = New System.Drawing.Size(390, 40) + Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem8.Size = New System.Drawing.Size(655, 30) Me.LayoutControlItem8.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem8.TextVisible = False ' @@ -431,23 +486,384 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem1.Control = Me.TextEdit1 Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem1.Name = "LayoutControlItem1" - Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem1.Size = New System.Drawing.Size(390, 40) + Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem1.Size = New System.Drawing.Size(651, 30) Me.LayoutControlItem1.Text = "GUID" - Me.LayoutControlItem1.TextSize = New System.Drawing.Size(122, 13) + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(98, 13) + ' + 'XtraTabControl1 + ' + Me.XtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.XtraTabControl1.Location = New System.Drawing.Point(0, 66) + Me.XtraTabControl1.Name = "XtraTabControl1" + Me.XtraTabControl1.SelectedTabPage = Me.PageProfile + Me.XtraTabControl1.Size = New System.Drawing.Size(1328, 610) + Me.XtraTabControl1.TabIndex = 5 + Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.PageProfile}) + ' + 'PageProfile + ' + Me.PageProfile.Controls.Add(Me.XtraTabControl2) + Me.PageProfile.Controls.Add(Me.LayoutControl1) + Me.PageProfile.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.pagesetup1 + Me.PageProfile.ImageOptions.SvgImageSize = New System.Drawing.Size(24, 24) + Me.PageProfile.Name = "PageProfile" + Me.PageProfile.Size = New System.Drawing.Size(1326, 576) + Me.PageProfile.Tag = "TAB_PAGE_PROFILE" + Me.PageProfile.Text = "Profil-Verwaltung" + ' + 'XtraTabControl2 + ' + Me.XtraTabControl2.Dock = System.Windows.Forms.DockStyle.Fill + Me.XtraTabControl2.Location = New System.Drawing.Point(0, 252) + Me.XtraTabControl2.Name = "XtraTabControl2" + Me.XtraTabControl2.SelectedTabPage = Me.PageDocumentSearch + Me.XtraTabControl2.Size = New System.Drawing.Size(1326, 324) + Me.XtraTabControl2.TabIndex = 3 + Me.XtraTabControl2.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.PageDocumentSearch, Me.PageDataSearch, Me.PageApplicationAssignment}) + ' + 'PageDocumentSearch + ' + Me.PageDocumentSearch.Controls.Add(Me.LayoutControl2) + Me.PageDocumentSearch.Controls.Add(Me.GridControl2) + Me.PageDocumentSearch.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.singlepageview + Me.PageDocumentSearch.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) + Me.PageDocumentSearch.Name = "PageDocumentSearch" + Me.PageDocumentSearch.Size = New System.Drawing.Size(1324, 298) + Me.PageDocumentSearch.Tag = "TAB_PAGE_DOCSEARCH" + Me.PageDocumentSearch.Text = "Dokument-Suche" + ' + 'LayoutControl2 + ' + Me.LayoutControl2.Controls.Add(Me.TextEdit5) + Me.LayoutControl2.Controls.Add(Me.TextEdit6) + Me.LayoutControl2.Controls.Add(Me.CheckEdit2) + Me.LayoutControl2.Controls.Add(Me.ComboBoxEdit1) + Me.LayoutControl2.Controls.Add(Me.TextEdit7) + Me.LayoutControl2.Controls.Add(Me.TextEdit8) + Me.LayoutControl2.Controls.Add(Me.txtAddedWho1) + Me.LayoutControl2.Controls.Add(Me.txtChangedWho1) + Me.LayoutControl2.Controls.Add(Me.txtAddedWhen1) + Me.LayoutControl2.Controls.Add(Me.txtChangedWhen1) + Me.LayoutControl2.Dock = System.Windows.Forms.DockStyle.Fill + Me.LayoutControl2.Location = New System.Drawing.Point(225, 0) + Me.LayoutControl2.Name = "LayoutControl2" + Me.LayoutControl2.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(1270, 407, 650, 400) + Me.LayoutControl2.Root = Me.LayoutControlGroup1 + Me.LayoutControl2.Size = New System.Drawing.Size(1099, 298) + Me.LayoutControl2.TabIndex = 1 + Me.LayoutControl2.Text = "LayoutControl2" ' - 'BarButtonItem3 + 'TextEdit5 ' - Me.BarButtonItem3.Caption = "Löschen" - Me.BarButtonItem3.Id = 5 - Me.BarButtonItem3.Name = "BarButtonItem3" + Me.TextEdit5.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "GUID", True)) + Me.TextEdit5.Location = New System.Drawing.Point(150, 15) + Me.TextEdit5.MenuManager = Me.RibbonControl1 + Me.TextEdit5.Name = "TextEdit5" + Me.TextEdit5.Size = New System.Drawing.Size(124, 20) + Me.TextEdit5.StyleController = Me.LayoutControl2 + Me.TextEdit5.TabIndex = 4 + ' + 'TBCW_PROF_DOC_SEARCHBindingSource + ' + Me.TBCW_PROF_DOC_SEARCHBindingSource.DataMember = "TBCW_PROF_DOC_SEARCH" + Me.TBCW_PROF_DOC_SEARCHBindingSource.DataSource = Me.DBCW_Stammdaten + ' + 'TextEdit6 + ' + Me.TextEdit6.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "TAB_TITLE", True)) + Me.TextEdit6.Location = New System.Drawing.Point(150, 45) + Me.TextEdit6.MenuManager = Me.RibbonControl1 + Me.TextEdit6.Name = "TextEdit6" + Me.TextEdit6.Size = New System.Drawing.Size(934, 20) + Me.TextEdit6.StyleController = Me.LayoutControl2 + Me.TextEdit6.TabIndex = 5 + ' + 'CheckEdit2 + ' + Me.CheckEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "ACTIVE", True)) + Me.CheckEdit2.Location = New System.Drawing.Point(689, 15) + Me.CheckEdit2.MenuManager = Me.RibbonControl1 + Me.CheckEdit2.Name = "CheckEdit2" + Me.CheckEdit2.Properties.Caption = "CheckEdit2" + Me.CheckEdit2.Size = New System.Drawing.Size(395, 18) + Me.CheckEdit2.StyleController = Me.LayoutControl2 + Me.CheckEdit2.TabIndex = 6 + ' + 'ComboBoxEdit1 + ' + Me.ComboBoxEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "TAB_INDEX", True)) + Me.ComboBoxEdit1.Location = New System.Drawing.Point(419, 15) + Me.ComboBoxEdit1.MenuManager = Me.RibbonControl1 + Me.ComboBoxEdit1.Name = "ComboBoxEdit1" + Me.ComboBoxEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.ComboBoxEdit1.Size = New System.Drawing.Size(260, 20) + Me.ComboBoxEdit1.StyleController = Me.LayoutControl2 + Me.ComboBoxEdit1.TabIndex = 7 + ' + 'TextEdit7 + ' + Me.TextEdit7.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "SQL_COMMAND", True)) + Me.TextEdit7.Location = New System.Drawing.Point(150, 75) + Me.TextEdit7.MenuManager = Me.RibbonControl1 + Me.TextEdit7.Name = "TextEdit7" + Me.TextEdit7.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "SQL bearbeiten", -1, True, True, False, EditorButtonImageOptions2, New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), SerializableAppearanceObject5, SerializableAppearanceObject6, SerializableAppearanceObject7, SerializableAppearanceObject8, "", "BUTTON_SEARCH_SQL", Nothing, DevExpress.Utils.ToolTipAnchor.[Default])}) + Me.TextEdit7.Properties.ReadOnly = True + Me.TextEdit7.Size = New System.Drawing.Size(934, 22) + Me.TextEdit7.StyleController = Me.LayoutControl2 + Me.TextEdit7.TabIndex = 8 + ' + 'TextEdit8 + ' + Me.TextEdit8.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "COUNT_COMMAND", True)) + Me.TextEdit8.Location = New System.Drawing.Point(150, 107) + Me.TextEdit8.MenuManager = Me.RibbonControl1 + Me.TextEdit8.Name = "TextEdit8" + Me.TextEdit8.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "SQL bearbeiten", -1, True, True, False, EditorButtonImageOptions3, New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), SerializableAppearanceObject9, SerializableAppearanceObject10, SerializableAppearanceObject11, SerializableAppearanceObject12, "", "BUTTON_COUNT_SQL", Nothing, DevExpress.Utils.ToolTipAnchor.[Default])}) + Me.TextEdit8.Size = New System.Drawing.Size(934, 22) + Me.TextEdit8.StyleController = Me.LayoutControl2 + Me.TextEdit8.TabIndex = 9 + ' + 'txtAddedWho1 + ' + Me.txtAddedWho1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "ADDED_WHO", True)) + Me.txtAddedWho1.Location = New System.Drawing.Point(150, 139) + Me.txtAddedWho1.Name = "txtAddedWho1" + Me.txtAddedWho1.Properties.ReadOnly = True + Me.txtAddedWho1.Size = New System.Drawing.Size(393, 20) + Me.txtAddedWho1.StyleController = Me.LayoutControl2 + Me.txtAddedWho1.TabIndex = 7 + ' + 'txtChangedWho1 + ' + Me.txtChangedWho1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "CHANGED_WHO", True)) + Me.txtChangedWho1.Location = New System.Drawing.Point(150, 169) + Me.txtChangedWho1.Name = "txtChangedWho1" + Me.txtChangedWho1.Properties.ReadOnly = True + Me.txtChangedWho1.Size = New System.Drawing.Size(393, 20) + Me.txtChangedWho1.StyleController = Me.LayoutControl2 + Me.txtChangedWho1.TabIndex = 9 + ' + 'txtAddedWhen1 + ' + Me.txtAddedWhen1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "ADDED_WHEN", True)) + Me.txtAddedWhen1.Location = New System.Drawing.Point(688, 139) + Me.txtAddedWhen1.Name = "txtAddedWhen1" + Me.txtAddedWhen1.Properties.ReadOnly = True + Me.txtAddedWhen1.Size = New System.Drawing.Size(396, 20) + Me.txtAddedWhen1.StyleController = Me.LayoutControl2 + Me.txtAddedWhen1.TabIndex = 8 + ' + 'txtChangedWhen1 + ' + Me.txtChangedWhen1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "CHANGED_WHEN", True)) + Me.txtChangedWhen1.Location = New System.Drawing.Point(688, 169) + Me.txtChangedWhen1.Name = "txtChangedWhen1" + Me.txtChangedWhen1.Properties.ReadOnly = True + Me.txtChangedWhen1.Size = New System.Drawing.Size(396, 20) + Me.txtChangedWhen1.StyleController = Me.LayoutControl2 + Me.txtChangedWhen1.TabIndex = 10 + ' + 'LayoutControlGroup1 + ' + Me.LayoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] + Me.LayoutControlGroup1.GroupBordersVisible = False + Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem10, Me.LayoutControlItem11, Me.LayoutControlItem13, Me.LayoutControlItem12, Me.LayoutControlItem14, Me.LayoutControlItem15, Me.LayoutControlItem16, Me.LayoutControlItem17, Me.LayoutControlItem18, Me.LayoutControlItem19}) + Me.LayoutControlGroup1.Name = "Root" + Me.LayoutControlGroup1.Size = New System.Drawing.Size(1099, 298) + Me.LayoutControlGroup1.TextVisible = False + ' + 'LayoutControlItem10 + ' + Me.LayoutControlItem10.Control = Me.TextEdit5 + Me.LayoutControlItem10.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlItem10.Name = "LayoutControlItem10" + Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem10.Size = New System.Drawing.Size(269, 30) + Me.LayoutControlItem10.TextSize = New System.Drawing.Size(132, 13) + ' + 'LayoutControlItem11 + ' + Me.LayoutControlItem11.Control = Me.TextEdit6 + Me.LayoutControlItem11.Location = New System.Drawing.Point(0, 30) + Me.LayoutControlItem11.Name = "LayoutControlItem11" + Me.LayoutControlItem11.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem11.Size = New System.Drawing.Size(1079, 30) + Me.LayoutControlItem11.TextSize = New System.Drawing.Size(132, 13) + ' + 'LayoutControlItem13 + ' + Me.LayoutControlItem13.Control = Me.ComboBoxEdit1 + Me.LayoutControlItem13.Location = New System.Drawing.Point(269, 0) + Me.LayoutControlItem13.Name = "LayoutControlItem13" + Me.LayoutControlItem13.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem13.Size = New System.Drawing.Size(405, 30) + Me.LayoutControlItem13.TextSize = New System.Drawing.Size(132, 13) + ' + 'LayoutControlItem12 + ' + Me.LayoutControlItem12.Control = Me.CheckEdit2 + Me.LayoutControlItem12.Location = New System.Drawing.Point(674, 0) + Me.LayoutControlItem12.Name = "LayoutControlItem12" + Me.LayoutControlItem12.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem12.Size = New System.Drawing.Size(405, 30) + Me.LayoutControlItem12.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem12.TextVisible = False + ' + 'LayoutControlItem14 + ' + Me.LayoutControlItem14.Control = Me.TextEdit7 + Me.LayoutControlItem14.Location = New System.Drawing.Point(0, 60) + Me.LayoutControlItem14.Name = "LayoutControlItem14" + Me.LayoutControlItem14.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem14.Size = New System.Drawing.Size(1079, 32) + Me.LayoutControlItem14.Text = "SQL für Suche" + Me.LayoutControlItem14.TextSize = New System.Drawing.Size(132, 13) + ' + 'LayoutControlItem15 + ' + Me.LayoutControlItem15.Control = Me.TextEdit8 + Me.LayoutControlItem15.Location = New System.Drawing.Point(0, 92) + Me.LayoutControlItem15.Name = "LayoutControlItem15" + Me.LayoutControlItem15.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem15.Size = New System.Drawing.Size(1079, 32) + Me.LayoutControlItem15.Text = "SQL für Ergebnis-Zählung" + Me.LayoutControlItem15.TextSize = New System.Drawing.Size(132, 13) + ' + 'LayoutControlItem16 + ' + Me.LayoutControlItem16.Control = Me.txtAddedWho1 + Me.LayoutControlItem16.ControlAlignment = System.Drawing.ContentAlignment.TopLeft + Me.LayoutControlItem16.CustomizationFormText = "Erstellt Wer" + Me.LayoutControlItem16.Location = New System.Drawing.Point(0, 124) + Me.LayoutControlItem16.Name = "LayoutControlItem16" + Me.LayoutControlItem16.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem16.Size = New System.Drawing.Size(538, 30) + Me.LayoutControlItem16.Text = "Erstellt Wer" + Me.LayoutControlItem16.TextSize = New System.Drawing.Size(132, 13) + ' + 'LayoutControlItem17 + ' + Me.LayoutControlItem17.Control = Me.txtChangedWho1 + Me.LayoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft + Me.LayoutControlItem17.CustomizationFormText = "Geändert Wer" + Me.LayoutControlItem17.Location = New System.Drawing.Point(0, 154) + Me.LayoutControlItem17.Name = "LayoutControlItem17" + Me.LayoutControlItem17.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem17.Size = New System.Drawing.Size(538, 124) + Me.LayoutControlItem17.Text = "Geändert Wer" + Me.LayoutControlItem17.TextSize = New System.Drawing.Size(132, 13) + ' + 'LayoutControlItem18 + ' + Me.LayoutControlItem18.Control = Me.txtAddedWhen1 + Me.LayoutControlItem18.ControlAlignment = System.Drawing.ContentAlignment.TopLeft + Me.LayoutControlItem18.CustomizationFormText = "Erstellt Wann" + Me.LayoutControlItem18.Location = New System.Drawing.Point(538, 124) + Me.LayoutControlItem18.Name = "LayoutControlItem18" + Me.LayoutControlItem18.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem18.Size = New System.Drawing.Size(541, 30) + Me.LayoutControlItem18.Text = "Erstellt Wann" + Me.LayoutControlItem18.TextSize = New System.Drawing.Size(132, 13) + ' + 'LayoutControlItem19 + ' + Me.LayoutControlItem19.Control = Me.txtChangedWhen1 + Me.LayoutControlItem19.ControlAlignment = System.Drawing.ContentAlignment.TopLeft + Me.LayoutControlItem19.CustomizationFormText = "Geändert Wann" + Me.LayoutControlItem19.Location = New System.Drawing.Point(538, 154) + Me.LayoutControlItem19.Name = "LayoutControlItem19" + Me.LayoutControlItem19.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem19.Size = New System.Drawing.Size(541, 124) + Me.LayoutControlItem19.Text = "Geändert Wann" + Me.LayoutControlItem19.TextSize = New System.Drawing.Size(132, 13) + ' + 'GridControl2 + ' + Me.GridControl2.DataSource = Me.TBCW_PROF_DOC_SEARCHBindingSource + Me.GridControl2.Dock = System.Windows.Forms.DockStyle.Left + Me.GridControl2.Location = New System.Drawing.Point(0, 0) + Me.GridControl2.MainView = Me.GridViewDocSearch + Me.GridControl2.MenuManager = Me.RibbonControl1 + Me.GridControl2.Name = "GridControl2" + Me.GridControl2.Size = New System.Drawing.Size(225, 298) + Me.GridControl2.TabIndex = 2 + Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDocSearch}) + ' + 'GridViewDocSearch + ' + Me.GridViewDocSearch.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colTAB_TITLE1}) + Me.GridViewDocSearch.GridControl = Me.GridControl2 + Me.GridViewDocSearch.Name = "GridViewDocSearch" + ' + 'colTAB_TITLE1 + ' + Me.colTAB_TITLE1.FieldName = "TAB_TITLE" + Me.colTAB_TITLE1.Name = "colTAB_TITLE1" + Me.colTAB_TITLE1.Visible = True + Me.colTAB_TITLE1.VisibleIndex = 0 + ' + 'PageDataSearch + ' + Me.PageDataSearch.Controls.Add(Me.GridControl1) + Me.PageDataSearch.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_database + Me.PageDataSearch.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) + Me.PageDataSearch.Name = "PageDataSearch" + Me.PageDataSearch.Size = New System.Drawing.Size(1324, 298) + Me.PageDataSearch.Text = "Daten-Suchen" + ' + 'GridControl1 + ' + Me.GridControl1.DataSource = Me.TBCW_PROF_DATA_SEARCHBindingSource + Me.GridControl1.Dock = System.Windows.Forms.DockStyle.Left + Me.GridControl1.Location = New System.Drawing.Point(0, 0) + Me.GridControl1.MainView = Me.GridViewDataSearch + Me.GridControl1.MenuManager = Me.RibbonControl1 + Me.GridControl1.Name = "GridControl1" + Me.GridControl1.Size = New System.Drawing.Size(225, 298) + Me.GridControl1.TabIndex = 0 + Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDataSearch}) + ' + 'TBCW_PROF_DATA_SEARCHBindingSource + ' + Me.TBCW_PROF_DATA_SEARCHBindingSource.DataMember = "TBCW_PROF_DATA_SEARCH" + Me.TBCW_PROF_DATA_SEARCHBindingSource.DataSource = Me.DBCW_Stammdaten + ' + 'GridViewDataSearch + ' + Me.GridViewDataSearch.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colTAB_TITLE}) + Me.GridViewDataSearch.GridControl = Me.GridControl1 + Me.GridViewDataSearch.Name = "GridViewDataSearch" + ' + 'colTAB_TITLE + ' + Me.colTAB_TITLE.FieldName = "TAB_TITLE" + Me.colTAB_TITLE.Name = "colTAB_TITLE" + Me.colTAB_TITLE.Visible = True + Me.colTAB_TITLE.VisibleIndex = 0 + ' + 'PageApplicationAssignment + ' + Me.PageApplicationAssignment.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.windows + Me.PageApplicationAssignment.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) + Me.PageApplicationAssignment.Name = "PageApplicationAssignment" + Me.PageApplicationAssignment.Size = New System.Drawing.Size(1324, 298) + Me.PageApplicationAssignment.Text = "Anwendungs-Zuordnung" + ' + 'TBCW_PROF_DOC_SEARCHTableAdapter + ' + Me.TBCW_PROF_DOC_SEARCHTableAdapter.ClearBeforeFill = True + ' + 'TBCW_PROF_DATA_SEARCHTableAdapter + ' + Me.TBCW_PROF_DATA_SEARCHTableAdapter.ClearBeforeFill = True ' 'frmAdmin_CWProfile ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(800, 450) - Me.Controls.Add(Me.LayoutControl1) + Me.ClientSize = New System.Drawing.Size(1328, 698) + Me.Controls.Add(Me.XtraTabControl1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) Me.Name = "frmAdmin_CWProfile" @@ -468,7 +884,6 @@ Partial Class frmAdmin_CWProfile CType(Me.txtChangedWhen.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.CheckEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit4.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TextEdit5.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() @@ -476,11 +891,45 @@ Partial Class frmAdmin_CWProfile CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.XtraTabControl1.ResumeLayout(False) + Me.PageProfile.ResumeLayout(False) + CType(Me.XtraTabControl2, System.ComponentModel.ISupportInitialize).EndInit() + Me.XtraTabControl2.ResumeLayout(False) + Me.PageDocumentSearch.ResumeLayout(False) + CType(Me.LayoutControl2, System.ComponentModel.ISupportInitialize).EndInit() + Me.LayoutControl2.ResumeLayout(False) + CType(Me.TextEdit5.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TBCW_PROF_DOC_SEARCHBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextEdit6.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.CheckEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextEdit7.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextEdit8.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtAddedWho1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtChangedWho1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtAddedWhen1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtChangedWhen1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem13, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem12, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem14, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem15, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem16, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem17, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem18, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem19, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridViewDocSearch, System.ComponentModel.ISupportInitialize).EndInit() + Me.PageDataSearch.ResumeLayout(False) + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TBCW_PROF_DATA_SEARCHBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridViewDataSearch, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -510,18 +959,52 @@ Partial Class frmAdmin_CWProfile Friend WithEvents txtChangedWho As DevExpress.XtraEditors.TextEdit Friend WithEvents txtChangedWhen As DevExpress.XtraEditors.TextEdit Friend WithEvents LayoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents LayoutControlItem6 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem5 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents LayoutControlItem7 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents labelStatus As DevExpress.XtraBars.BarStaticItem Friend WithEvents labelError As DevExpress.XtraBars.BarStaticItem Friend WithEvents CheckEdit1 As DevExpress.XtraEditors.CheckEdit - Friend WithEvents TextEdit4 As DevExpress.XtraEditors.TextEdit - Friend WithEvents TextEdit5 As DevExpress.XtraEditors.TextEdit - Friend WithEvents SimpleButton1 As DevExpress.XtraEditors.SimpleButton Friend WithEvents LayoutControlItem8 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents LayoutControlItem10 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem9 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents LayoutControlItem11 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents LayoutControlItem6 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem7 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl + Friend WithEvents PageProfile As DevExpress.XtraTab.XtraTabPage + Friend WithEvents XtraTabControl2 As DevExpress.XtraTab.XtraTabControl + Friend WithEvents PageDocumentSearch As DevExpress.XtraTab.XtraTabPage + Friend WithEvents PageDataSearch As DevExpress.XtraTab.XtraTabPage + Friend WithEvents PageApplicationAssignment As DevExpress.XtraTab.XtraTabPage + Friend WithEvents TextEdit4 As DevExpress.XtraEditors.ButtonEdit + Friend WithEvents LayoutControl2 As DevExpress.XtraLayout.LayoutControl + Friend WithEvents TextEdit5 As DevExpress.XtraEditors.TextEdit + Friend WithEvents LayoutControlGroup1 As DevExpress.XtraLayout.LayoutControlGroup + Friend WithEvents LayoutControlItem10 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents TextEdit6 As DevExpress.XtraEditors.TextEdit + Friend WithEvents CheckEdit2 As DevExpress.XtraEditors.CheckEdit + Friend WithEvents ComboBoxEdit1 As DevExpress.XtraEditors.ComboBoxEdit + Friend WithEvents LayoutControlItem11 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem13 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem12 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents TextEdit7 As DevExpress.XtraEditors.ButtonEdit + Friend WithEvents TextEdit8 As DevExpress.XtraEditors.ButtonEdit + Friend WithEvents LayoutControlItem14 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem15 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents txtAddedWho1 As DevExpress.XtraEditors.TextEdit + Friend WithEvents txtChangedWho1 As DevExpress.XtraEditors.TextEdit + Friend WithEvents txtAddedWhen1 As DevExpress.XtraEditors.TextEdit + Friend WithEvents txtChangedWhen1 As DevExpress.XtraEditors.TextEdit + Friend WithEvents LayoutControlItem16 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem17 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem18 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem19 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents TBCW_PROF_DOC_SEARCHBindingSource As BindingSource + Friend WithEvents TBCW_PROF_DOC_SEARCHTableAdapter As DBCW_StammdatenTableAdapters.TBCW_PROF_DOC_SEARCHTableAdapter + Friend WithEvents TBCW_PROF_DATA_SEARCHBindingSource As BindingSource + Friend WithEvents TBCW_PROF_DATA_SEARCHTableAdapter As DBCW_StammdatenTableAdapters.TBCW_PROF_DATA_SEARCHTableAdapter + Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl + Friend WithEvents GridViewDataSearch As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents colTAB_TITLE As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents GridControl2 As DevExpress.XtraGrid.GridControl + Friend WithEvents GridViewDocSearch As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents colTAB_TITLE1 As DevExpress.XtraGrid.Columns.GridColumn End Class diff --git a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.resx b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.resx index a7629c4a..a80e47af 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.resx +++ b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.resx @@ -129,4 +129,16 @@ 612, 17 + + 785, 17 + + + 1336, 17 + + + 1063, 17 + + + 17, 56 + \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb index e02fd74a..664a9d89 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb @@ -1,4 +1,11 @@ -Imports DigitalData.Modules.Logging +Imports DevExpress.XtraEditors +Imports DevExpress.XtraGrid.Views.Grid +Imports DevExpress.XtraLayout +Imports DevExpress.XtraTab +Imports DigitalData.Controls.RegexEditor +Imports DigitalData.Controls.SQLEditor +Imports DigitalData.GUIs.Common +Imports DigitalData.Modules.Logging Public Class frmAdmin_CWProfile Implements frmAdmin_Interface @@ -7,6 +14,16 @@ Public Class frmAdmin_CWProfile Public Property HasChanges As Boolean Implements frmAdmin_Interface.HasChanges Public Property IsInsert As Boolean Implements frmAdmin_Interface.IsInsert + Private Const BUTTON_REGEX_PROFILE = "BUTTON_REGEX_PROFILE" + Private Const BUTTON_SEARCH_SQL = "BUTTON_SEARCH_SQL" + Private Const BUTTON_COUNT_SQL = "BUTTON_COUNT_SQL" + + Private Const TAB_PAGE_PROFILE = "TAB_PAGE_PROFILE" + Private Const TAB_PAGE_DOCSEARCH = "TAB_PAGE_DOCSEARCH" + Private Const TAB_PAGE_DATASEARCH = "TAB_PAGE_DATASEARCH" + + Private Current_Page As String + Public Sub New(PrimaryKey As Integer) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() @@ -17,9 +34,51 @@ Public Class frmAdmin_CWProfile Me.IsInsert = IsInsert End Sub + Private Sub Any_EditValueChanged(sender As BaseEdit, e As EventArgs) + Dim oControl As BaseEdit = sender + + If TypeOf oControl.Parent Is LayoutControl Then + Dim oLayoutControl As LayoutControl = oControl.Parent + + If TypeOf oLayoutControl.Parent Is XtraTabPage Then + Dim oTabControl As XtraTabPage = oLayoutControl.Parent + Dim oTag As String = oTabControl.Tag + + Select Case oTag + Case TAB_PAGE_DOCSEARCH + Current_Page = TAB_PAGE_DOCSEARCH + + Case TAB_PAGE_PROFILE + Current_Page = TAB_PAGE_DOCSEARCH + + Case Else + Current_Page = Nothing + End Select + End If + End If + End Sub + Private Sub frmAdmin_CWProfile_Load(sender As Object, e As EventArgs) Handles Me.Load Try + TBCW_PROFILESTableAdapter.Connection.ConnectionString = My.Database.CurrentSQLConnectionString TBCW_PROFILESTableAdapter.Fill(DBCW_Stammdaten.TBCW_PROFILES, PrimaryKey) + + TBCW_PROF_DOC_SEARCHTableAdapter.Connection.ConnectionString = My.Database.CurrentSQLConnectionString + TBCW_PROF_DOC_SEARCHTableAdapter.Fill(DBCW_Stammdaten.TBCW_PROF_DOC_SEARCH, PrimaryKey) + + TBCW_PROF_DATA_SEARCHTableAdapter.Connection.ConnectionString = My.Database.CurrentSQLConnectionString + TBCW_PROF_DATA_SEARCHTableAdapter.Fill(DBCW_Stammdaten.TBCW_PROF_DATA_SEARCH, PrimaryKey) + + Dim oViews As New List(Of GridView) From {GridViewDataSearch, GridViewDocSearch} + Dim oGridBuilder As New GridBuilder(oViews) + oGridBuilder. + WithDefaults(). + WithReadOnlyOptions() + + For Each oContainer As LayoutControlItem In Root.Items + Dim oControl As BaseEdit = oContainer.Control + AddHandler oControl.GotFocus, AddressOf Any_EditValueChanged + Next Catch ex As Exception ShowError(ex) End Try @@ -77,4 +136,43 @@ Public Class frmAdmin_CWProfile Public Function DeleteData() As Boolean Implements frmAdmin_Interface.DeleteData Throw New NotImplementedException() End Function + + Private Sub TextEdit4_ButtonClick(sender As Object, e As DevExpress.XtraEditors.Controls.ButtonPressedEventArgs) Handles TextEdit4.ButtonClick + Dim oTextEdit As TextEdit = sender + + If e.Button.Tag = BUTTON_REGEX_PROFILE Then + Dim oForm As New frmRegexEditor(oTextEdit.EditValue) + Dim oResult = oForm.ShowDialog() + + If oResult = DialogResult.OK Then + oTextEdit.EditValue = oForm.RegexString + End If + End If + End Sub + + Private Sub TextEdit7_ButtonClick(sender As Object, e As DevExpress.XtraEditors.Controls.ButtonPressedEventArgs) Handles TextEdit7.ButtonClick + Dim oTextEdit As TextEdit = sender + + If e.Button.Tag = BUTTON_SEARCH_SQL Then + Dim oForm As New frmSQLEditor(oTextEdit.EditValue) + Dim oResult = oForm.ShowDialog() + + If oResult = DialogResult.OK Then + oTextEdit.EditValue = oForm.SQLString + End If + End If + End Sub + + Private Sub TextEdit8_ButtonClick(sender As Object, e As DevExpress.XtraEditors.Controls.ButtonPressedEventArgs) Handles TextEdit8.ButtonClick + Dim oTextEdit As TextEdit = sender + + If e.Button.Tag = BUTTON_COUNT_SQL Then + Dim oForm As New frmSQLEditor(oTextEdit.EditValue) + Dim oResult = oForm.ShowDialog() + + If oResult = DialogResult.OK Then + oTextEdit.EditValue = oForm.SQLString + End If + End If + End Sub End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/DBCW_Stammdaten.Designer.vb b/GUIs.ZooFlow/DBCW_Stammdaten.Designer.vb index 37cf7830..350e5fc8 100644 --- a/GUIs.ZooFlow/DBCW_Stammdaten.Designer.vb +++ b/GUIs.ZooFlow/DBCW_Stammdaten.Designer.vb @@ -27,6 +27,14 @@ Partial Public Class DBCW_Stammdaten Private tableTBCW_PROFILES As TBCW_PROFILESDataTable + Private tableTBCW_PROF_DOC_SEARCH As TBCW_PROF_DOC_SEARCHDataTable + + Private tableTBCW_PROF_DATA_SEARCH As TBCW_PROF_DATA_SEARCHDataTable + + Private relationFK_TBCW_PROF_DOC_SEARCH_PROF_IF As Global.System.Data.DataRelation + + Private relationFK_TBCW_PROF_DATA_SEARCH_PROF_IF As Global.System.Data.DataRelation + Private _schemaSerializationMode As Global.System.Data.SchemaSerializationMode = Global.System.Data.SchemaSerializationMode.IncludeSchema _ + Public ReadOnly Property TBCW_PROF_DOC_SEARCH() As TBCW_PROF_DOC_SEARCHDataTable + Get + Return Me.tableTBCW_PROF_DOC_SEARCH + End Get + End Property + + _ + Public ReadOnly Property TBCW_PROF_DATA_SEARCH() As TBCW_PROF_DATA_SEARCHDataTable + Get + Return Me.tableTBCW_PROF_DATA_SEARCH + End Get + End Property + _ + Private Function ShouldSerializeTBCW_PROF_DOC_SEARCH() As Boolean + Return false + End Function + + _ + Private Function ShouldSerializeTBCW_PROF_DATA_SEARCH() As Boolean + Return false + End Function + _ Private Sub SchemaChanged(ByVal sender As Object, ByVal e As Global.System.ComponentModel.CollectionChangeEventArgs) @@ -275,6 +349,12 @@ Partial Public Class DBCW_Stammdaten _ Public Delegate Sub TBCW_PROFILESRowChangeEventHandler(ByVal sender As Object, ByVal e As TBCW_PROFILESRowChangeEvent) + _ + Public Delegate Sub TBCW_PROF_DOC_SEARCHRowChangeEventHandler(ByVal sender As Object, ByVal e As TBCW_PROF_DOC_SEARCHRowChangeEvent) + + _ + Public Delegate Sub TBCW_PROF_DATA_SEARCHRowChangeEventHandler(ByVal sender As Object, ByVal e As TBCW_PROF_DATA_SEARCHRowChangeEvent) + ''' '''Represents the strongly named DataTable class. ''' @@ -668,233 +748,2740 @@ Partial Public Class DBCW_Stammdaten End Class ''' - '''Represents strongly named DataRow class. + '''Represents the strongly named DataTable class. ''' - Partial Public Class TBCW_PROFILESRow - Inherits Global.System.Data.DataRow + _ + Partial Public Class TBCW_PROF_DOC_SEARCHDataTable + Inherits Global.System.Data.TypedTableBase(Of TBCW_PROF_DOC_SEARCHRow) - Private tableTBCW_PROFILES As TBCW_PROFILESDataTable + Private columnGUID As Global.System.Data.DataColumn + + Private columnPROFILE_ID As Global.System.Data.DataColumn + + Private columnCONN_ID As Global.System.Data.DataColumn + + Private columnSQL_COMMAND As Global.System.Data.DataColumn + + Private columnTAB_INDEX As Global.System.Data.DataColumn + + Private columnACTIVE As Global.System.Data.DataColumn + + Private columnTAB_TITLE As Global.System.Data.DataColumn + + Private columnADDED_WHO As Global.System.Data.DataColumn + + Private columnADDED_WHEN As Global.System.Data.DataColumn + + Private columnCHANGED_WHO As Global.System.Data.DataColumn + + Private columnCHANGED_WHEN As Global.System.Data.DataColumn + + Private columnCOUNT_COMMAND As Global.System.Data.DataColumn _ - Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) - MyBase.New(rb) - Me.tableTBCW_PROFILES = CType(Me.Table,TBCW_PROFILESDataTable) + Public Sub New() + MyBase.New + Me.TableName = "TBCW_PROF_DOC_SEARCH" + Me.BeginInit + Me.InitClass + Me.EndInit End Sub _ - Public Property GUID() As Integer + Friend Sub New(ByVal table As Global.System.Data.DataTable) + MyBase.New + Me.TableName = table.TableName + If (table.CaseSensitive <> table.DataSet.CaseSensitive) Then + Me.CaseSensitive = table.CaseSensitive + End If + If (table.Locale.ToString <> table.DataSet.Locale.ToString) Then + Me.Locale = table.Locale + End If + If (table.Namespace <> table.DataSet.Namespace) Then + Me.Namespace = table.Namespace + End If + Me.Prefix = table.Prefix + Me.MinimumCapacity = table.MinimumCapacity + End Sub + + _ + Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) + MyBase.New(info, context) + Me.InitVars + End Sub + + _ + Public ReadOnly Property GUIDColumn() As Global.System.Data.DataColumn Get - Return CType(Me(Me.tableTBCW_PROFILES.GUIDColumn),Integer) + Return Me.columnGUID End Get - Set - Me(Me.tableTBCW_PROFILES.GUIDColumn) = value - End Set End Property _ - Public Property NAME() As String + Public ReadOnly Property PROFILE_IDColumn() As Global.System.Data.DataColumn Get - Return CType(Me(Me.tableTBCW_PROFILES.NAMEColumn),String) + Return Me.columnPROFILE_ID End Get - Set - Me(Me.tableTBCW_PROFILES.NAMEColumn) = value - End Set End Property _ - Public Property COMMENT() As String + Public ReadOnly Property CONN_IDColumn() As Global.System.Data.DataColumn Get - Try - Return CType(Me(Me.tableTBCW_PROFILES.COMMENTColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte COMMENT in Tabelle TBCW_PROFILES ist DBNull.", e) - End Try + Return Me.columnCONN_ID End Get - Set - Me(Me.tableTBCW_PROFILES.COMMENTColumn) = value - End Set End Property _ - Public Property REGEX_EXPRESSION() As String + Public ReadOnly Property SQL_COMMANDColumn() As Global.System.Data.DataColumn Get - Return CType(Me(Me.tableTBCW_PROFILES.REGEX_EXPRESSIONColumn),String) + Return Me.columnSQL_COMMAND End Get - Set - Me(Me.tableTBCW_PROFILES.REGEX_EXPRESSIONColumn) = value - End Set End Property _ - Public Property ADDED_WHO() As String + Public ReadOnly Property TAB_INDEXColumn() As Global.System.Data.DataColumn Get - Return CType(Me(Me.tableTBCW_PROFILES.ADDED_WHOColumn),String) + Return Me.columnTAB_INDEX End Get - Set - Me(Me.tableTBCW_PROFILES.ADDED_WHOColumn) = value - End Set End Property _ - Public Property ADDED_WHEN() As Date + Public ReadOnly Property ACTIVEColumn() As Global.System.Data.DataColumn Get - Try - Return CType(Me(Me.tableTBCW_PROFILES.ADDED_WHENColumn),Date) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ADDED_WHEN in Tabelle TBCW_PROFILES ist DBNull.", e) - End Try + Return Me.columnACTIVE End Get - Set - Me(Me.tableTBCW_PROFILES.ADDED_WHENColumn) = value - End Set End Property _ - Public Property CHANGED_WHO() As String + Public ReadOnly Property TAB_TITLEColumn() As Global.System.Data.DataColumn Get - Try - Return CType(Me(Me.tableTBCW_PROFILES.CHANGED_WHOColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHO in Tabelle TBCW_PROFILES ist DBNull.", e) - End Try + Return Me.columnTAB_TITLE End Get - Set - Me(Me.tableTBCW_PROFILES.CHANGED_WHOColumn) = value - End Set End Property _ - Public Property CHANGED_WHEN() As Date + Public ReadOnly Property ADDED_WHOColumn() As Global.System.Data.DataColumn Get - Try - Return CType(Me(Me.tableTBCW_PROFILES.CHANGED_WHENColumn),Date) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHEN in Tabelle TBCW_PROFILES ist DBNull.", e) - End Try + Return Me.columnADDED_WHO End Get - Set - Me(Me.tableTBCW_PROFILES.CHANGED_WHENColumn) = value - End Set End Property _ - Public Property ACTIVE() As Boolean + Public ReadOnly Property ADDED_WHENColumn() As Global.System.Data.DataColumn Get - Return CType(Me(Me.tableTBCW_PROFILES.ACTIVEColumn),Boolean) + Return Me.columnADDED_WHEN End Get - Set - Me(Me.tableTBCW_PROFILES.ACTIVEColumn) = value - End Set End Property _ - Public Property PROFILE_TYPE() As Short + Public ReadOnly Property CHANGED_WHOColumn() As Global.System.Data.DataColumn Get - Return CType(Me(Me.tableTBCW_PROFILES.PROFILE_TYPEColumn),Short) + Return Me.columnCHANGED_WHO End Get - Set - Me(Me.tableTBCW_PROFILES.PROFILE_TYPEColumn) = value - End Set End Property _ - Public Function IsCOMMENTNull() As Boolean - Return Me.IsNull(Me.tableTBCW_PROFILES.COMMENTColumn) - End Function + Public ReadOnly Property CHANGED_WHENColumn() As Global.System.Data.DataColumn + Get + Return Me.columnCHANGED_WHEN + End Get + End Property _ - Public Sub SetCOMMENTNull() - Me(Me.tableTBCW_PROFILES.COMMENTColumn) = Global.System.Convert.DBNull - End Sub + Public ReadOnly Property COUNT_COMMANDColumn() As Global.System.Data.DataColumn + Get + Return Me.columnCOUNT_COMMAND + End Get + End Property + + _ + Public ReadOnly Property Count() As Integer + Get + Return Me.Rows.Count + End Get + End Property _ - Public Function IsADDED_WHENNull() As Boolean - Return Me.IsNull(Me.tableTBCW_PROFILES.ADDED_WHENColumn) - End Function + Public Default ReadOnly Property Item(ByVal index As Integer) As TBCW_PROF_DOC_SEARCHRow + Get + Return CType(Me.Rows(index),TBCW_PROF_DOC_SEARCHRow) + End Get + End Property + + _ + Public Event TBCW_PROF_DOC_SEARCHRowChanging As TBCW_PROF_DOC_SEARCHRowChangeEventHandler + + _ + Public Event TBCW_PROF_DOC_SEARCHRowChanged As TBCW_PROF_DOC_SEARCHRowChangeEventHandler + + _ + Public Event TBCW_PROF_DOC_SEARCHRowDeleting As TBCW_PROF_DOC_SEARCHRowChangeEventHandler + + _ + Public Event TBCW_PROF_DOC_SEARCHRowDeleted As TBCW_PROF_DOC_SEARCHRowChangeEventHandler _ - Public Sub SetADDED_WHENNull() - Me(Me.tableTBCW_PROFILES.ADDED_WHENColumn) = Global.System.Convert.DBNull + Public Overloads Sub AddTBCW_PROF_DOC_SEARCHRow(ByVal row As TBCW_PROF_DOC_SEARCHRow) + Me.Rows.Add(row) End Sub _ - Public Function IsCHANGED_WHONull() As Boolean - Return Me.IsNull(Me.tableTBCW_PROFILES.CHANGED_WHOColumn) + Public Overloads Function AddTBCW_PROF_DOC_SEARCHRow(ByVal parentTBCW_PROFILESRowByFK_TBCW_PROF_DOC_SEARCH_PROF_IF As TBCW_PROFILESRow, ByVal CONN_ID As Byte, ByVal SQL_COMMAND As String, ByVal TAB_INDEX As Byte, ByVal ACTIVE As Boolean, ByVal TAB_TITLE As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date, ByVal COUNT_COMMAND As String) As TBCW_PROF_DOC_SEARCHRow + Dim rowTBCW_PROF_DOC_SEARCHRow As TBCW_PROF_DOC_SEARCHRow = CType(Me.NewRow,TBCW_PROF_DOC_SEARCHRow) + Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, CONN_ID, SQL_COMMAND, TAB_INDEX, ACTIVE, TAB_TITLE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COUNT_COMMAND} + If (Not (parentTBCW_PROFILESRowByFK_TBCW_PROF_DOC_SEARCH_PROF_IF) Is Nothing) Then + columnValuesArray(1) = parentTBCW_PROFILESRowByFK_TBCW_PROF_DOC_SEARCH_PROF_IF(0) + End If + rowTBCW_PROF_DOC_SEARCHRow.ItemArray = columnValuesArray + Me.Rows.Add(rowTBCW_PROF_DOC_SEARCHRow) + Return rowTBCW_PROF_DOC_SEARCHRow End Function _ - Public Sub SetCHANGED_WHONull() - Me(Me.tableTBCW_PROFILES.CHANGED_WHOColumn) = Global.System.Convert.DBNull - End Sub + Public Function FindByGUID(ByVal GUID As Integer) As TBCW_PROF_DOC_SEARCHRow + Return CType(Me.Rows.Find(New Object() {GUID}),TBCW_PROF_DOC_SEARCHRow) + End Function _ - Public Function IsCHANGED_WHENNull() As Boolean - Return Me.IsNull(Me.tableTBCW_PROFILES.CHANGED_WHENColumn) + Public Overrides Function Clone() As Global.System.Data.DataTable + Dim cln As TBCW_PROF_DOC_SEARCHDataTable = CType(MyBase.Clone,TBCW_PROF_DOC_SEARCHDataTable) + cln.InitVars + Return cln End Function _ - Public Sub SetCHANGED_WHENNull() - Me(Me.tableTBCW_PROFILES.CHANGED_WHENColumn) = Global.System.Convert.DBNull - End Sub - End Class - - ''' - '''Row event argument class - ''' - _ - Public Class TBCW_PROFILESRowChangeEvent - Inherits Global.System.EventArgs - - Private eventRow As TBCW_PROFILESRow + Protected Overrides Function CreateInstance() As Global.System.Data.DataTable + Return New TBCW_PROF_DOC_SEARCHDataTable() + End Function - Private eventAction As Global.System.Data.DataRowAction + _ + Friend Sub InitVars() + Me.columnGUID = MyBase.Columns("GUID") + Me.columnPROFILE_ID = MyBase.Columns("PROFILE_ID") + Me.columnCONN_ID = MyBase.Columns("CONN_ID") + Me.columnSQL_COMMAND = MyBase.Columns("SQL_COMMAND") + Me.columnTAB_INDEX = MyBase.Columns("TAB_INDEX") + Me.columnACTIVE = MyBase.Columns("ACTIVE") + Me.columnTAB_TITLE = MyBase.Columns("TAB_TITLE") + Me.columnADDED_WHO = MyBase.Columns("ADDED_WHO") + Me.columnADDED_WHEN = MyBase.Columns("ADDED_WHEN") + Me.columnCHANGED_WHO = MyBase.Columns("CHANGED_WHO") + Me.columnCHANGED_WHEN = MyBase.Columns("CHANGED_WHEN") + Me.columnCOUNT_COMMAND = MyBase.Columns("COUNT_COMMAND") + End Sub _ - Public Sub New(ByVal row As TBCW_PROFILESRow, ByVal action As Global.System.Data.DataRowAction) + Private Sub InitClass() + Me.columnGUID = New Global.System.Data.DataColumn("GUID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnGUID) + Me.columnPROFILE_ID = New Global.System.Data.DataColumn("PROFILE_ID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnPROFILE_ID) + Me.columnCONN_ID = New Global.System.Data.DataColumn("CONN_ID", GetType(Byte), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnCONN_ID) + Me.columnSQL_COMMAND = New Global.System.Data.DataColumn("SQL_COMMAND", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnSQL_COMMAND) + Me.columnTAB_INDEX = New Global.System.Data.DataColumn("TAB_INDEX", GetType(Byte), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnTAB_INDEX) + Me.columnACTIVE = New Global.System.Data.DataColumn("ACTIVE", GetType(Boolean), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnACTIVE) + Me.columnTAB_TITLE = New Global.System.Data.DataColumn("TAB_TITLE", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnTAB_TITLE) + Me.columnADDED_WHO = New Global.System.Data.DataColumn("ADDED_WHO", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnADDED_WHO) + Me.columnADDED_WHEN = New Global.System.Data.DataColumn("ADDED_WHEN", GetType(Date), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnADDED_WHEN) + Me.columnCHANGED_WHO = New Global.System.Data.DataColumn("CHANGED_WHO", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnCHANGED_WHO) + Me.columnCHANGED_WHEN = New Global.System.Data.DataColumn("CHANGED_WHEN", GetType(Date), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnCHANGED_WHEN) + Me.columnCOUNT_COMMAND = New Global.System.Data.DataColumn("COUNT_COMMAND", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnCOUNT_COMMAND) + Me.Constraints.Add(New Global.System.Data.UniqueConstraint("Constraint1", New Global.System.Data.DataColumn() {Me.columnGUID}, true)) + Me.columnGUID.AutoIncrement = true + Me.columnGUID.AutoIncrementSeed = -1 + Me.columnGUID.AutoIncrementStep = -1 + Me.columnGUID.AllowDBNull = false + Me.columnGUID.ReadOnly = true + Me.columnGUID.Unique = true + Me.columnPROFILE_ID.AllowDBNull = false + Me.columnCONN_ID.AllowDBNull = false + Me.columnSQL_COMMAND.AllowDBNull = false + Me.columnSQL_COMMAND.MaxLength = 2147483647 + Me.columnTAB_INDEX.AllowDBNull = false + Me.columnACTIVE.AllowDBNull = false + Me.columnTAB_TITLE.AllowDBNull = false + Me.columnTAB_TITLE.MaxLength = 100 + Me.columnADDED_WHO.AllowDBNull = false + Me.columnADDED_WHO.MaxLength = 50 + Me.columnCHANGED_WHO.MaxLength = 50 + Me.columnCOUNT_COMMAND.MaxLength = 2147483647 + End Sub + + _ + Public Function NewTBCW_PROF_DOC_SEARCHRow() As TBCW_PROF_DOC_SEARCHRow + Return CType(Me.NewRow,TBCW_PROF_DOC_SEARCHRow) + End Function + + _ + Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow + Return New TBCW_PROF_DOC_SEARCHRow(builder) + End Function + + _ + Protected Overrides Function GetRowType() As Global.System.Type + Return GetType(TBCW_PROF_DOC_SEARCHRow) + End Function + + _ + Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowChanged(e) + If (Not (Me.TBCW_PROF_DOC_SEARCHRowChangedEvent) Is Nothing) Then + RaiseEvent TBCW_PROF_DOC_SEARCHRowChanged(Me, New TBCW_PROF_DOC_SEARCHRowChangeEvent(CType(e.Row,TBCW_PROF_DOC_SEARCHRow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowChanging(e) + If (Not (Me.TBCW_PROF_DOC_SEARCHRowChangingEvent) Is Nothing) Then + RaiseEvent TBCW_PROF_DOC_SEARCHRowChanging(Me, New TBCW_PROF_DOC_SEARCHRowChangeEvent(CType(e.Row,TBCW_PROF_DOC_SEARCHRow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowDeleted(e) + If (Not (Me.TBCW_PROF_DOC_SEARCHRowDeletedEvent) Is Nothing) Then + RaiseEvent TBCW_PROF_DOC_SEARCHRowDeleted(Me, New TBCW_PROF_DOC_SEARCHRowChangeEvent(CType(e.Row,TBCW_PROF_DOC_SEARCHRow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowDeleting(e) + If (Not (Me.TBCW_PROF_DOC_SEARCHRowDeletingEvent) Is Nothing) Then + RaiseEvent TBCW_PROF_DOC_SEARCHRowDeleting(Me, New TBCW_PROF_DOC_SEARCHRowChangeEvent(CType(e.Row,TBCW_PROF_DOC_SEARCHRow), e.Action)) + End If + End Sub + + _ + Public Sub RemoveTBCW_PROF_DOC_SEARCHRow(ByVal row As TBCW_PROF_DOC_SEARCHRow) + Me.Rows.Remove(row) + End Sub + + _ + Public Shared Function GetTypedTableSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType + Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() + Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence() + Dim ds As DBCW_Stammdaten = New DBCW_Stammdaten() + Dim any1 As Global.System.Xml.Schema.XmlSchemaAny = New Global.System.Xml.Schema.XmlSchemaAny() + any1.Namespace = "http://www.w3.org/2001/XMLSchema" + any1.MinOccurs = New Decimal(0) + any1.MaxOccurs = Decimal.MaxValue + any1.ProcessContents = Global.System.Xml.Schema.XmlSchemaContentProcessing.Lax + sequence.Items.Add(any1) + Dim any2 As Global.System.Xml.Schema.XmlSchemaAny = New Global.System.Xml.Schema.XmlSchemaAny() + any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1" + any2.MinOccurs = New Decimal(1) + any2.ProcessContents = Global.System.Xml.Schema.XmlSchemaContentProcessing.Lax + sequence.Items.Add(any2) + Dim attribute1 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() + attribute1.Name = "namespace" + attribute1.FixedValue = ds.Namespace + type.Attributes.Add(attribute1) + Dim attribute2 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() + attribute2.Name = "tableTypeName" + attribute2.FixedValue = "TBCW_PROF_DOC_SEARCHDataTable" + type.Attributes.Add(attribute2) + type.Particle = sequence + Dim dsSchema As Global.System.Xml.Schema.XmlSchema = ds.GetSchemaSerializable + If xs.Contains(dsSchema.TargetNamespace) Then + Dim s1 As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream() + Dim s2 As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream() + Try + Dim schema As Global.System.Xml.Schema.XmlSchema = Nothing + dsSchema.Write(s1) + Dim schemas As Global.System.Collections.IEnumerator = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator + Do While schemas.MoveNext + schema = CType(schemas.Current,Global.System.Xml.Schema.XmlSchema) + s2.SetLength(0) + schema.Write(s2) + If (s1.Length = s2.Length) Then + s1.Position = 0 + s2.Position = 0 + + Do While ((s1.Position <> s1.Length) _ + AndAlso (s1.ReadByte = s2.ReadByte)) + + + Loop + If (s1.Position = s1.Length) Then + Return type + End If + End If + + Loop + Finally + If (Not (s1) Is Nothing) Then + s1.Close + End If + If (Not (s2) Is Nothing) Then + s2.Close + End If + End Try + End If + xs.Add(dsSchema) + Return type + End Function + End Class + + ''' + '''Represents the strongly named DataTable class. + ''' + _ + Partial Public Class TBCW_PROF_DATA_SEARCHDataTable + Inherits Global.System.Data.TypedTableBase(Of TBCW_PROF_DATA_SEARCHRow) + + Private columnGUID As Global.System.Data.DataColumn + + Private columnPROFILE_ID As Global.System.Data.DataColumn + + Private columnCONN_ID As Global.System.Data.DataColumn + + Private columnSQL_COMMAND As Global.System.Data.DataColumn + + Private columnTAB_INDEX As Global.System.Data.DataColumn + + Private columnACTIVE As Global.System.Data.DataColumn + + Private columnTAB_TITLE As Global.System.Data.DataColumn + + Private columnADDED_WHO As Global.System.Data.DataColumn + + Private columnADDED_WHEN As Global.System.Data.DataColumn + + Private columnCHANGED_WHO As Global.System.Data.DataColumn + + Private columnCHANGED_WHEN As Global.System.Data.DataColumn + + Private columnCOUNT_COMMAND As Global.System.Data.DataColumn + + _ + Public Sub New() + MyBase.New + Me.TableName = "TBCW_PROF_DATA_SEARCH" + Me.BeginInit + Me.InitClass + Me.EndInit + End Sub + + _ + Friend Sub New(ByVal table As Global.System.Data.DataTable) + MyBase.New + Me.TableName = table.TableName + If (table.CaseSensitive <> table.DataSet.CaseSensitive) Then + Me.CaseSensitive = table.CaseSensitive + End If + If (table.Locale.ToString <> table.DataSet.Locale.ToString) Then + Me.Locale = table.Locale + End If + If (table.Namespace <> table.DataSet.Namespace) Then + Me.Namespace = table.Namespace + End If + Me.Prefix = table.Prefix + Me.MinimumCapacity = table.MinimumCapacity + End Sub + + _ + Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) + MyBase.New(info, context) + Me.InitVars + End Sub + + _ + Public ReadOnly Property GUIDColumn() As Global.System.Data.DataColumn + Get + Return Me.columnGUID + End Get + End Property + + _ + Public ReadOnly Property PROFILE_IDColumn() As Global.System.Data.DataColumn + Get + Return Me.columnPROFILE_ID + End Get + End Property + + _ + Public ReadOnly Property CONN_IDColumn() As Global.System.Data.DataColumn + Get + Return Me.columnCONN_ID + End Get + End Property + + _ + Public ReadOnly Property SQL_COMMANDColumn() As Global.System.Data.DataColumn + Get + Return Me.columnSQL_COMMAND + End Get + End Property + + _ + Public ReadOnly Property TAB_INDEXColumn() As Global.System.Data.DataColumn + Get + Return Me.columnTAB_INDEX + End Get + End Property + + _ + Public ReadOnly Property ACTIVEColumn() As Global.System.Data.DataColumn + Get + Return Me.columnACTIVE + End Get + End Property + + _ + Public ReadOnly Property TAB_TITLEColumn() As Global.System.Data.DataColumn + Get + Return Me.columnTAB_TITLE + End Get + End Property + + _ + Public ReadOnly Property ADDED_WHOColumn() As Global.System.Data.DataColumn + Get + Return Me.columnADDED_WHO + End Get + End Property + + _ + Public ReadOnly Property ADDED_WHENColumn() As Global.System.Data.DataColumn + Get + Return Me.columnADDED_WHEN + End Get + End Property + + _ + Public ReadOnly Property CHANGED_WHOColumn() As Global.System.Data.DataColumn + Get + Return Me.columnCHANGED_WHO + End Get + End Property + + _ + Public ReadOnly Property CHANGED_WHENColumn() As Global.System.Data.DataColumn + Get + Return Me.columnCHANGED_WHEN + End Get + End Property + + _ + Public ReadOnly Property COUNT_COMMANDColumn() As Global.System.Data.DataColumn + Get + Return Me.columnCOUNT_COMMAND + End Get + End Property + + _ + Public ReadOnly Property Count() As Integer + Get + Return Me.Rows.Count + End Get + End Property + + _ + Public Default ReadOnly Property Item(ByVal index As Integer) As TBCW_PROF_DATA_SEARCHRow + Get + Return CType(Me.Rows(index),TBCW_PROF_DATA_SEARCHRow) + End Get + End Property + + _ + Public Event TBCW_PROF_DATA_SEARCHRowChanging As TBCW_PROF_DATA_SEARCHRowChangeEventHandler + + _ + Public Event TBCW_PROF_DATA_SEARCHRowChanged As TBCW_PROF_DATA_SEARCHRowChangeEventHandler + + _ + Public Event TBCW_PROF_DATA_SEARCHRowDeleting As TBCW_PROF_DATA_SEARCHRowChangeEventHandler + + _ + Public Event TBCW_PROF_DATA_SEARCHRowDeleted As TBCW_PROF_DATA_SEARCHRowChangeEventHandler + + _ + Public Overloads Sub AddTBCW_PROF_DATA_SEARCHRow(ByVal row As TBCW_PROF_DATA_SEARCHRow) + Me.Rows.Add(row) + End Sub + + _ + Public Overloads Function AddTBCW_PROF_DATA_SEARCHRow(ByVal parentTBCW_PROFILESRowByFK_TBCW_PROF_DATA_SEARCH_PROF_IF As TBCW_PROFILESRow, ByVal CONN_ID As Byte, ByVal SQL_COMMAND As String, ByVal TAB_INDEX As Byte, ByVal ACTIVE As Boolean, ByVal TAB_TITLE As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date, ByVal COUNT_COMMAND As String) As TBCW_PROF_DATA_SEARCHRow + Dim rowTBCW_PROF_DATA_SEARCHRow As TBCW_PROF_DATA_SEARCHRow = CType(Me.NewRow,TBCW_PROF_DATA_SEARCHRow) + Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, CONN_ID, SQL_COMMAND, TAB_INDEX, ACTIVE, TAB_TITLE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COUNT_COMMAND} + If (Not (parentTBCW_PROFILESRowByFK_TBCW_PROF_DATA_SEARCH_PROF_IF) Is Nothing) Then + columnValuesArray(1) = parentTBCW_PROFILESRowByFK_TBCW_PROF_DATA_SEARCH_PROF_IF(0) + End If + rowTBCW_PROF_DATA_SEARCHRow.ItemArray = columnValuesArray + Me.Rows.Add(rowTBCW_PROF_DATA_SEARCHRow) + Return rowTBCW_PROF_DATA_SEARCHRow + End Function + + _ + Public Function FindByGUID(ByVal GUID As Integer) As TBCW_PROF_DATA_SEARCHRow + Return CType(Me.Rows.Find(New Object() {GUID}),TBCW_PROF_DATA_SEARCHRow) + End Function + + _ + Public Overrides Function Clone() As Global.System.Data.DataTable + Dim cln As TBCW_PROF_DATA_SEARCHDataTable = CType(MyBase.Clone,TBCW_PROF_DATA_SEARCHDataTable) + cln.InitVars + Return cln + End Function + + _ + Protected Overrides Function CreateInstance() As Global.System.Data.DataTable + Return New TBCW_PROF_DATA_SEARCHDataTable() + End Function + + _ + Friend Sub InitVars() + Me.columnGUID = MyBase.Columns("GUID") + Me.columnPROFILE_ID = MyBase.Columns("PROFILE_ID") + Me.columnCONN_ID = MyBase.Columns("CONN_ID") + Me.columnSQL_COMMAND = MyBase.Columns("SQL_COMMAND") + Me.columnTAB_INDEX = MyBase.Columns("TAB_INDEX") + Me.columnACTIVE = MyBase.Columns("ACTIVE") + Me.columnTAB_TITLE = MyBase.Columns("TAB_TITLE") + Me.columnADDED_WHO = MyBase.Columns("ADDED_WHO") + Me.columnADDED_WHEN = MyBase.Columns("ADDED_WHEN") + Me.columnCHANGED_WHO = MyBase.Columns("CHANGED_WHO") + Me.columnCHANGED_WHEN = MyBase.Columns("CHANGED_WHEN") + Me.columnCOUNT_COMMAND = MyBase.Columns("COUNT_COMMAND") + End Sub + + _ + Private Sub InitClass() + Me.columnGUID = New Global.System.Data.DataColumn("GUID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnGUID) + Me.columnPROFILE_ID = New Global.System.Data.DataColumn("PROFILE_ID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnPROFILE_ID) + Me.columnCONN_ID = New Global.System.Data.DataColumn("CONN_ID", GetType(Byte), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnCONN_ID) + Me.columnSQL_COMMAND = New Global.System.Data.DataColumn("SQL_COMMAND", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnSQL_COMMAND) + Me.columnTAB_INDEX = New Global.System.Data.DataColumn("TAB_INDEX", GetType(Byte), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnTAB_INDEX) + Me.columnACTIVE = New Global.System.Data.DataColumn("ACTIVE", GetType(Boolean), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnACTIVE) + Me.columnTAB_TITLE = New Global.System.Data.DataColumn("TAB_TITLE", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnTAB_TITLE) + Me.columnADDED_WHO = New Global.System.Data.DataColumn("ADDED_WHO", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnADDED_WHO) + Me.columnADDED_WHEN = New Global.System.Data.DataColumn("ADDED_WHEN", GetType(Date), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnADDED_WHEN) + Me.columnCHANGED_WHO = New Global.System.Data.DataColumn("CHANGED_WHO", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnCHANGED_WHO) + Me.columnCHANGED_WHEN = New Global.System.Data.DataColumn("CHANGED_WHEN", GetType(Date), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnCHANGED_WHEN) + Me.columnCOUNT_COMMAND = New Global.System.Data.DataColumn("COUNT_COMMAND", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnCOUNT_COMMAND) + Me.Constraints.Add(New Global.System.Data.UniqueConstraint("Constraint1", New Global.System.Data.DataColumn() {Me.columnGUID}, true)) + Me.columnGUID.AutoIncrement = true + Me.columnGUID.AutoIncrementSeed = -1 + Me.columnGUID.AutoIncrementStep = -1 + Me.columnGUID.AllowDBNull = false + Me.columnGUID.ReadOnly = true + Me.columnGUID.Unique = true + Me.columnPROFILE_ID.AllowDBNull = false + Me.columnCONN_ID.AllowDBNull = false + Me.columnSQL_COMMAND.AllowDBNull = false + Me.columnSQL_COMMAND.MaxLength = 2147483647 + Me.columnTAB_INDEX.AllowDBNull = false + Me.columnACTIVE.AllowDBNull = false + Me.columnTAB_TITLE.AllowDBNull = false + Me.columnTAB_TITLE.MaxLength = 100 + Me.columnADDED_WHO.AllowDBNull = false + Me.columnADDED_WHO.MaxLength = 50 + Me.columnCHANGED_WHO.MaxLength = 50 + Me.columnCOUNT_COMMAND.AllowDBNull = false + Me.columnCOUNT_COMMAND.MaxLength = 2147483647 + End Sub + + _ + Public Function NewTBCW_PROF_DATA_SEARCHRow() As TBCW_PROF_DATA_SEARCHRow + Return CType(Me.NewRow,TBCW_PROF_DATA_SEARCHRow) + End Function + + _ + Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow + Return New TBCW_PROF_DATA_SEARCHRow(builder) + End Function + + _ + Protected Overrides Function GetRowType() As Global.System.Type + Return GetType(TBCW_PROF_DATA_SEARCHRow) + End Function + + _ + Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowChanged(e) + If (Not (Me.TBCW_PROF_DATA_SEARCHRowChangedEvent) Is Nothing) Then + RaiseEvent TBCW_PROF_DATA_SEARCHRowChanged(Me, New TBCW_PROF_DATA_SEARCHRowChangeEvent(CType(e.Row,TBCW_PROF_DATA_SEARCHRow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowChanging(e) + If (Not (Me.TBCW_PROF_DATA_SEARCHRowChangingEvent) Is Nothing) Then + RaiseEvent TBCW_PROF_DATA_SEARCHRowChanging(Me, New TBCW_PROF_DATA_SEARCHRowChangeEvent(CType(e.Row,TBCW_PROF_DATA_SEARCHRow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowDeleted(e) + If (Not (Me.TBCW_PROF_DATA_SEARCHRowDeletedEvent) Is Nothing) Then + RaiseEvent TBCW_PROF_DATA_SEARCHRowDeleted(Me, New TBCW_PROF_DATA_SEARCHRowChangeEvent(CType(e.Row,TBCW_PROF_DATA_SEARCHRow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowDeleting(e) + If (Not (Me.TBCW_PROF_DATA_SEARCHRowDeletingEvent) Is Nothing) Then + RaiseEvent TBCW_PROF_DATA_SEARCHRowDeleting(Me, New TBCW_PROF_DATA_SEARCHRowChangeEvent(CType(e.Row,TBCW_PROF_DATA_SEARCHRow), e.Action)) + End If + End Sub + + _ + Public Sub RemoveTBCW_PROF_DATA_SEARCHRow(ByVal row As TBCW_PROF_DATA_SEARCHRow) + Me.Rows.Remove(row) + End Sub + + _ + Public Shared Function GetTypedTableSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType + Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() + Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence() + Dim ds As DBCW_Stammdaten = New DBCW_Stammdaten() + Dim any1 As Global.System.Xml.Schema.XmlSchemaAny = New Global.System.Xml.Schema.XmlSchemaAny() + any1.Namespace = "http://www.w3.org/2001/XMLSchema" + any1.MinOccurs = New Decimal(0) + any1.MaxOccurs = Decimal.MaxValue + any1.ProcessContents = Global.System.Xml.Schema.XmlSchemaContentProcessing.Lax + sequence.Items.Add(any1) + Dim any2 As Global.System.Xml.Schema.XmlSchemaAny = New Global.System.Xml.Schema.XmlSchemaAny() + any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1" + any2.MinOccurs = New Decimal(1) + any2.ProcessContents = Global.System.Xml.Schema.XmlSchemaContentProcessing.Lax + sequence.Items.Add(any2) + Dim attribute1 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() + attribute1.Name = "namespace" + attribute1.FixedValue = ds.Namespace + type.Attributes.Add(attribute1) + Dim attribute2 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() + attribute2.Name = "tableTypeName" + attribute2.FixedValue = "TBCW_PROF_DATA_SEARCHDataTable" + type.Attributes.Add(attribute2) + type.Particle = sequence + Dim dsSchema As Global.System.Xml.Schema.XmlSchema = ds.GetSchemaSerializable + If xs.Contains(dsSchema.TargetNamespace) Then + Dim s1 As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream() + Dim s2 As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream() + Try + Dim schema As Global.System.Xml.Schema.XmlSchema = Nothing + dsSchema.Write(s1) + Dim schemas As Global.System.Collections.IEnumerator = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator + Do While schemas.MoveNext + schema = CType(schemas.Current,Global.System.Xml.Schema.XmlSchema) + s2.SetLength(0) + schema.Write(s2) + If (s1.Length = s2.Length) Then + s1.Position = 0 + s2.Position = 0 + + Do While ((s1.Position <> s1.Length) _ + AndAlso (s1.ReadByte = s2.ReadByte)) + + + Loop + If (s1.Position = s1.Length) Then + Return type + End If + End If + + Loop + Finally + If (Not (s1) Is Nothing) Then + s1.Close + End If + If (Not (s2) Is Nothing) Then + s2.Close + End If + End Try + End If + xs.Add(dsSchema) + Return type + End Function + End Class + + ''' + '''Represents strongly named DataRow class. + ''' + Partial Public Class TBCW_PROFILESRow + Inherits Global.System.Data.DataRow + + Private tableTBCW_PROFILES As TBCW_PROFILESDataTable + + _ + Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) + MyBase.New(rb) + Me.tableTBCW_PROFILES = CType(Me.Table,TBCW_PROFILESDataTable) + End Sub + + _ + Public Property GUID() As Integer + Get + Return CType(Me(Me.tableTBCW_PROFILES.GUIDColumn),Integer) + End Get + Set + Me(Me.tableTBCW_PROFILES.GUIDColumn) = value + End Set + End Property + + _ + Public Property NAME() As String + Get + Return CType(Me(Me.tableTBCW_PROFILES.NAMEColumn),String) + End Get + Set + Me(Me.tableTBCW_PROFILES.NAMEColumn) = value + End Set + End Property + + _ + Public Property COMMENT() As String + Get + Try + Return CType(Me(Me.tableTBCW_PROFILES.COMMENTColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte COMMENT in Tabelle TBCW_PROFILES ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBCW_PROFILES.COMMENTColumn) = value + End Set + End Property + + _ + Public Property REGEX_EXPRESSION() As String + Get + Return CType(Me(Me.tableTBCW_PROFILES.REGEX_EXPRESSIONColumn),String) + End Get + Set + Me(Me.tableTBCW_PROFILES.REGEX_EXPRESSIONColumn) = value + End Set + End Property + + _ + Public Property ADDED_WHO() As String + Get + Return CType(Me(Me.tableTBCW_PROFILES.ADDED_WHOColumn),String) + End Get + Set + Me(Me.tableTBCW_PROFILES.ADDED_WHOColumn) = value + End Set + End Property + + _ + Public Property ADDED_WHEN() As Date + Get + Try + Return CType(Me(Me.tableTBCW_PROFILES.ADDED_WHENColumn),Date) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ADDED_WHEN in Tabelle TBCW_PROFILES ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBCW_PROFILES.ADDED_WHENColumn) = value + End Set + End Property + + _ + Public Property CHANGED_WHO() As String + Get + Try + Return CType(Me(Me.tableTBCW_PROFILES.CHANGED_WHOColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHO in Tabelle TBCW_PROFILES ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBCW_PROFILES.CHANGED_WHOColumn) = value + End Set + End Property + + _ + Public Property CHANGED_WHEN() As Date + Get + Try + Return CType(Me(Me.tableTBCW_PROFILES.CHANGED_WHENColumn),Date) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHEN in Tabelle TBCW_PROFILES ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBCW_PROFILES.CHANGED_WHENColumn) = value + End Set + End Property + + _ + Public Property ACTIVE() As Boolean + Get + Return CType(Me(Me.tableTBCW_PROFILES.ACTIVEColumn),Boolean) + End Get + Set + Me(Me.tableTBCW_PROFILES.ACTIVEColumn) = value + End Set + End Property + + _ + Public Property PROFILE_TYPE() As Short + Get + Return CType(Me(Me.tableTBCW_PROFILES.PROFILE_TYPEColumn),Short) + End Get + Set + Me(Me.tableTBCW_PROFILES.PROFILE_TYPEColumn) = value + End Set + End Property + + _ + Public Function IsCOMMENTNull() As Boolean + Return Me.IsNull(Me.tableTBCW_PROFILES.COMMENTColumn) + End Function + + _ + Public Sub SetCOMMENTNull() + Me(Me.tableTBCW_PROFILES.COMMENTColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsADDED_WHENNull() As Boolean + Return Me.IsNull(Me.tableTBCW_PROFILES.ADDED_WHENColumn) + End Function + + _ + Public Sub SetADDED_WHENNull() + Me(Me.tableTBCW_PROFILES.ADDED_WHENColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsCHANGED_WHONull() As Boolean + Return Me.IsNull(Me.tableTBCW_PROFILES.CHANGED_WHOColumn) + End Function + + _ + Public Sub SetCHANGED_WHONull() + Me(Me.tableTBCW_PROFILES.CHANGED_WHOColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsCHANGED_WHENNull() As Boolean + Return Me.IsNull(Me.tableTBCW_PROFILES.CHANGED_WHENColumn) + End Function + + _ + Public Sub SetCHANGED_WHENNull() + Me(Me.tableTBCW_PROFILES.CHANGED_WHENColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function GetTBCW_PROF_DOC_SEARCHRows() As TBCW_PROF_DOC_SEARCHRow() + If (Me.Table.ChildRelations("FK_TBCW_PROF_DOC_SEARCH_PROF_IF") Is Nothing) Then + Return New TBCW_PROF_DOC_SEARCHRow(-1) {} + Else + Return CType(MyBase.GetChildRows(Me.Table.ChildRelations("FK_TBCW_PROF_DOC_SEARCH_PROF_IF")),TBCW_PROF_DOC_SEARCHRow()) + End If + End Function + + _ + Public Function GetTBCW_PROF_DATA_SEARCHRows() As TBCW_PROF_DATA_SEARCHRow() + If (Me.Table.ChildRelations("FK_TBCW_PROF_DATA_SEARCH_PROF_IF") Is Nothing) Then + Return New TBCW_PROF_DATA_SEARCHRow(-1) {} + Else + Return CType(MyBase.GetChildRows(Me.Table.ChildRelations("FK_TBCW_PROF_DATA_SEARCH_PROF_IF")),TBCW_PROF_DATA_SEARCHRow()) + End If + End Function + End Class + + ''' + '''Represents strongly named DataRow class. + ''' + Partial Public Class TBCW_PROF_DOC_SEARCHRow + Inherits Global.System.Data.DataRow + + Private tableTBCW_PROF_DOC_SEARCH As TBCW_PROF_DOC_SEARCHDataTable + + _ + Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) + MyBase.New(rb) + Me.tableTBCW_PROF_DOC_SEARCH = CType(Me.Table,TBCW_PROF_DOC_SEARCHDataTable) + End Sub + + _ + Public Property GUID() As Integer + Get + Return CType(Me(Me.tableTBCW_PROF_DOC_SEARCH.GUIDColumn),Integer) + End Get + Set + Me(Me.tableTBCW_PROF_DOC_SEARCH.GUIDColumn) = value + End Set + End Property + + _ + Public Property PROFILE_ID() As Integer + Get + Return CType(Me(Me.tableTBCW_PROF_DOC_SEARCH.PROFILE_IDColumn),Integer) + End Get + Set + Me(Me.tableTBCW_PROF_DOC_SEARCH.PROFILE_IDColumn) = value + End Set + End Property + + _ + Public Property CONN_ID() As Byte + Get + Return CType(Me(Me.tableTBCW_PROF_DOC_SEARCH.CONN_IDColumn),Byte) + End Get + Set + Me(Me.tableTBCW_PROF_DOC_SEARCH.CONN_IDColumn) = value + End Set + End Property + + _ + Public Property SQL_COMMAND() As String + Get + Return CType(Me(Me.tableTBCW_PROF_DOC_SEARCH.SQL_COMMANDColumn),String) + End Get + Set + Me(Me.tableTBCW_PROF_DOC_SEARCH.SQL_COMMANDColumn) = value + End Set + End Property + + _ + Public Property TAB_INDEX() As Byte + Get + Return CType(Me(Me.tableTBCW_PROF_DOC_SEARCH.TAB_INDEXColumn),Byte) + End Get + Set + Me(Me.tableTBCW_PROF_DOC_SEARCH.TAB_INDEXColumn) = value + End Set + End Property + + _ + Public Property ACTIVE() As Boolean + Get + Return CType(Me(Me.tableTBCW_PROF_DOC_SEARCH.ACTIVEColumn),Boolean) + End Get + Set + Me(Me.tableTBCW_PROF_DOC_SEARCH.ACTIVEColumn) = value + End Set + End Property + + _ + Public Property TAB_TITLE() As String + Get + Return CType(Me(Me.tableTBCW_PROF_DOC_SEARCH.TAB_TITLEColumn),String) + End Get + Set + Me(Me.tableTBCW_PROF_DOC_SEARCH.TAB_TITLEColumn) = value + End Set + End Property + + _ + Public Property ADDED_WHO() As String + Get + Return CType(Me(Me.tableTBCW_PROF_DOC_SEARCH.ADDED_WHOColumn),String) + End Get + Set + Me(Me.tableTBCW_PROF_DOC_SEARCH.ADDED_WHOColumn) = value + End Set + End Property + + _ + Public Property ADDED_WHEN() As Date + Get + Try + Return CType(Me(Me.tableTBCW_PROF_DOC_SEARCH.ADDED_WHENColumn),Date) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ADDED_WHEN in Tabelle TBCW_PROF_DOC_SEARCH ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBCW_PROF_DOC_SEARCH.ADDED_WHENColumn) = value + End Set + End Property + + _ + Public Property CHANGED_WHO() As String + Get + Try + Return CType(Me(Me.tableTBCW_PROF_DOC_SEARCH.CHANGED_WHOColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHO in Tabelle TBCW_PROF_DOC_SEARCH ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBCW_PROF_DOC_SEARCH.CHANGED_WHOColumn) = value + End Set + End Property + + _ + Public Property CHANGED_WHEN() As Date + Get + Try + Return CType(Me(Me.tableTBCW_PROF_DOC_SEARCH.CHANGED_WHENColumn),Date) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHEN in Tabelle TBCW_PROF_DOC_SEARCH ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBCW_PROF_DOC_SEARCH.CHANGED_WHENColumn) = value + End Set + End Property + + _ + Public Property COUNT_COMMAND() As String + Get + Try + Return CType(Me(Me.tableTBCW_PROF_DOC_SEARCH.COUNT_COMMANDColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte COUNT_COMMAND in Tabelle TBCW_PROF_DOC_SEARCH ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBCW_PROF_DOC_SEARCH.COUNT_COMMANDColumn) = value + End Set + End Property + + _ + Public Property TBCW_PROFILESRow() As TBCW_PROFILESRow + Get + Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_TBCW_PROF_DOC_SEARCH_PROF_IF")),TBCW_PROFILESRow) + End Get + Set + Me.SetParentRow(value, Me.Table.ParentRelations("FK_TBCW_PROF_DOC_SEARCH_PROF_IF")) + End Set + End Property + + _ + Public Function IsADDED_WHENNull() As Boolean + Return Me.IsNull(Me.tableTBCW_PROF_DOC_SEARCH.ADDED_WHENColumn) + End Function + + _ + Public Sub SetADDED_WHENNull() + Me(Me.tableTBCW_PROF_DOC_SEARCH.ADDED_WHENColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsCHANGED_WHONull() As Boolean + Return Me.IsNull(Me.tableTBCW_PROF_DOC_SEARCH.CHANGED_WHOColumn) + End Function + + _ + Public Sub SetCHANGED_WHONull() + Me(Me.tableTBCW_PROF_DOC_SEARCH.CHANGED_WHOColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsCHANGED_WHENNull() As Boolean + Return Me.IsNull(Me.tableTBCW_PROF_DOC_SEARCH.CHANGED_WHENColumn) + End Function + + _ + Public Sub SetCHANGED_WHENNull() + Me(Me.tableTBCW_PROF_DOC_SEARCH.CHANGED_WHENColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsCOUNT_COMMANDNull() As Boolean + Return Me.IsNull(Me.tableTBCW_PROF_DOC_SEARCH.COUNT_COMMANDColumn) + End Function + + _ + Public Sub SetCOUNT_COMMANDNull() + Me(Me.tableTBCW_PROF_DOC_SEARCH.COUNT_COMMANDColumn) = Global.System.Convert.DBNull + End Sub + End Class + + ''' + '''Represents strongly named DataRow class. + ''' + Partial Public Class TBCW_PROF_DATA_SEARCHRow + Inherits Global.System.Data.DataRow + + Private tableTBCW_PROF_DATA_SEARCH As TBCW_PROF_DATA_SEARCHDataTable + + _ + Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) + MyBase.New(rb) + Me.tableTBCW_PROF_DATA_SEARCH = CType(Me.Table,TBCW_PROF_DATA_SEARCHDataTable) + End Sub + + _ + Public Property GUID() As Integer + Get + Return CType(Me(Me.tableTBCW_PROF_DATA_SEARCH.GUIDColumn),Integer) + End Get + Set + Me(Me.tableTBCW_PROF_DATA_SEARCH.GUIDColumn) = value + End Set + End Property + + _ + Public Property PROFILE_ID() As Integer + Get + Return CType(Me(Me.tableTBCW_PROF_DATA_SEARCH.PROFILE_IDColumn),Integer) + End Get + Set + Me(Me.tableTBCW_PROF_DATA_SEARCH.PROFILE_IDColumn) = value + End Set + End Property + + _ + Public Property CONN_ID() As Byte + Get + Return CType(Me(Me.tableTBCW_PROF_DATA_SEARCH.CONN_IDColumn),Byte) + End Get + Set + Me(Me.tableTBCW_PROF_DATA_SEARCH.CONN_IDColumn) = value + End Set + End Property + + _ + Public Property SQL_COMMAND() As String + Get + Return CType(Me(Me.tableTBCW_PROF_DATA_SEARCH.SQL_COMMANDColumn),String) + End Get + Set + Me(Me.tableTBCW_PROF_DATA_SEARCH.SQL_COMMANDColumn) = value + End Set + End Property + + _ + Public Property TAB_INDEX() As Byte + Get + Return CType(Me(Me.tableTBCW_PROF_DATA_SEARCH.TAB_INDEXColumn),Byte) + End Get + Set + Me(Me.tableTBCW_PROF_DATA_SEARCH.TAB_INDEXColumn) = value + End Set + End Property + + _ + Public Property ACTIVE() As Boolean + Get + Return CType(Me(Me.tableTBCW_PROF_DATA_SEARCH.ACTIVEColumn),Boolean) + End Get + Set + Me(Me.tableTBCW_PROF_DATA_SEARCH.ACTIVEColumn) = value + End Set + End Property + + _ + Public Property TAB_TITLE() As String + Get + Return CType(Me(Me.tableTBCW_PROF_DATA_SEARCH.TAB_TITLEColumn),String) + End Get + Set + Me(Me.tableTBCW_PROF_DATA_SEARCH.TAB_TITLEColumn) = value + End Set + End Property + + _ + Public Property ADDED_WHO() As String + Get + Return CType(Me(Me.tableTBCW_PROF_DATA_SEARCH.ADDED_WHOColumn),String) + End Get + Set + Me(Me.tableTBCW_PROF_DATA_SEARCH.ADDED_WHOColumn) = value + End Set + End Property + + _ + Public Property ADDED_WHEN() As Date + Get + Try + Return CType(Me(Me.tableTBCW_PROF_DATA_SEARCH.ADDED_WHENColumn),Date) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ADDED_WHEN in Tabelle TBCW_PROF_DATA_SEARCH ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBCW_PROF_DATA_SEARCH.ADDED_WHENColumn) = value + End Set + End Property + + _ + Public Property CHANGED_WHO() As String + Get + Try + Return CType(Me(Me.tableTBCW_PROF_DATA_SEARCH.CHANGED_WHOColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHO in Tabelle TBCW_PROF_DATA_SEARCH ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBCW_PROF_DATA_SEARCH.CHANGED_WHOColumn) = value + End Set + End Property + + _ + Public Property CHANGED_WHEN() As Date + Get + Try + Return CType(Me(Me.tableTBCW_PROF_DATA_SEARCH.CHANGED_WHENColumn),Date) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHEN in Tabelle TBCW_PROF_DATA_SEARCH ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBCW_PROF_DATA_SEARCH.CHANGED_WHENColumn) = value + End Set + End Property + + _ + Public Property COUNT_COMMAND() As String + Get + Return CType(Me(Me.tableTBCW_PROF_DATA_SEARCH.COUNT_COMMANDColumn),String) + End Get + Set + Me(Me.tableTBCW_PROF_DATA_SEARCH.COUNT_COMMANDColumn) = value + End Set + End Property + + _ + Public Property TBCW_PROFILESRow() As TBCW_PROFILESRow + Get + Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_TBCW_PROF_DATA_SEARCH_PROF_IF")),TBCW_PROFILESRow) + End Get + Set + Me.SetParentRow(value, Me.Table.ParentRelations("FK_TBCW_PROF_DATA_SEARCH_PROF_IF")) + End Set + End Property + + _ + Public Function IsADDED_WHENNull() As Boolean + Return Me.IsNull(Me.tableTBCW_PROF_DATA_SEARCH.ADDED_WHENColumn) + End Function + + _ + Public Sub SetADDED_WHENNull() + Me(Me.tableTBCW_PROF_DATA_SEARCH.ADDED_WHENColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsCHANGED_WHONull() As Boolean + Return Me.IsNull(Me.tableTBCW_PROF_DATA_SEARCH.CHANGED_WHOColumn) + End Function + + _ + Public Sub SetCHANGED_WHONull() + Me(Me.tableTBCW_PROF_DATA_SEARCH.CHANGED_WHOColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsCHANGED_WHENNull() As Boolean + Return Me.IsNull(Me.tableTBCW_PROF_DATA_SEARCH.CHANGED_WHENColumn) + End Function + + _ + Public Sub SetCHANGED_WHENNull() + Me(Me.tableTBCW_PROF_DATA_SEARCH.CHANGED_WHENColumn) = Global.System.Convert.DBNull + End Sub + End Class + + ''' + '''Row event argument class + ''' + _ + Public Class TBCW_PROFILESRowChangeEvent + Inherits Global.System.EventArgs + + Private eventRow As TBCW_PROFILESRow + + Private eventAction As Global.System.Data.DataRowAction + + _ + Public Sub New(ByVal row As TBCW_PROFILESRow, ByVal action As Global.System.Data.DataRowAction) + MyBase.New + Me.eventRow = row + Me.eventAction = action + End Sub + + _ + Public ReadOnly Property Row() As TBCW_PROFILESRow + Get + Return Me.eventRow + End Get + End Property + + _ + Public ReadOnly Property Action() As Global.System.Data.DataRowAction + Get + Return Me.eventAction + End Get + End Property + End Class + + ''' + '''Row event argument class + ''' + _ + Public Class TBCW_PROF_DOC_SEARCHRowChangeEvent + Inherits Global.System.EventArgs + + Private eventRow As TBCW_PROF_DOC_SEARCHRow + + Private eventAction As Global.System.Data.DataRowAction + + _ + Public Sub New(ByVal row As TBCW_PROF_DOC_SEARCHRow, ByVal action As Global.System.Data.DataRowAction) + MyBase.New + Me.eventRow = row + Me.eventAction = action + End Sub + + _ + Public ReadOnly Property Row() As TBCW_PROF_DOC_SEARCHRow + Get + Return Me.eventRow + End Get + End Property + + _ + Public ReadOnly Property Action() As Global.System.Data.DataRowAction + Get + Return Me.eventAction + End Get + End Property + End Class + + ''' + '''Row event argument class + ''' + _ + Public Class TBCW_PROF_DATA_SEARCHRowChangeEvent + Inherits Global.System.EventArgs + + Private eventRow As TBCW_PROF_DATA_SEARCHRow + + Private eventAction As Global.System.Data.DataRowAction + + _ + Public Sub New(ByVal row As TBCW_PROF_DATA_SEARCHRow, ByVal action As Global.System.Data.DataRowAction) + MyBase.New + Me.eventRow = row + Me.eventAction = action + End Sub + + _ + Public ReadOnly Property Row() As TBCW_PROF_DATA_SEARCHRow + Get + Return Me.eventRow + End Get + End Property + + _ + Public ReadOnly Property Action() As Global.System.Data.DataRowAction + Get + Return Me.eventAction + End Get + End Property + End Class +End Class + +Namespace DBCW_StammdatenTableAdapters + + ''' + '''Represents the connection and commands used to retrieve and save data. + ''' + _ + Partial Public Class TBCW_PROFILESTableAdapter + Inherits Global.System.ComponentModel.Component + + Private WithEvents _adapter As Global.System.Data.SqlClient.SqlDataAdapter + + Private _connection As Global.System.Data.SqlClient.SqlConnection + + Private _transaction As Global.System.Data.SqlClient.SqlTransaction + + Private _commandCollection() As Global.System.Data.SqlClient.SqlCommand + + Private _clearBeforeFill As Boolean + + _ + Public Sub New() + MyBase.New + Me.ClearBeforeFill = true + End Sub + + _ + Protected Friend ReadOnly Property Adapter() As Global.System.Data.SqlClient.SqlDataAdapter + Get + If (Me._adapter Is Nothing) Then + Me.InitAdapter + End If + Return Me._adapter + End Get + End Property + + _ + Friend Property Connection() As Global.System.Data.SqlClient.SqlConnection + Get + If (Me._connection Is Nothing) Then + Me.InitConnection + End If + Return Me._connection + End Get + Set + Me._connection = value + If (Not (Me.Adapter.InsertCommand) Is Nothing) Then + Me.Adapter.InsertCommand.Connection = value + End If + If (Not (Me.Adapter.DeleteCommand) Is Nothing) Then + Me.Adapter.DeleteCommand.Connection = value + End If + If (Not (Me.Adapter.UpdateCommand) Is Nothing) Then + Me.Adapter.UpdateCommand.Connection = value + End If + Dim i As Integer = 0 + Do While (i < Me.CommandCollection.Length) + If (Not (Me.CommandCollection(i)) Is Nothing) Then + CType(Me.CommandCollection(i),Global.System.Data.SqlClient.SqlCommand).Connection = value + End If + i = (i + 1) + Loop + End Set + End Property + + _ + Friend Property Transaction() As Global.System.Data.SqlClient.SqlTransaction + Get + Return Me._transaction + End Get + Set + Me._transaction = value + Dim i As Integer = 0 + Do While (i < Me.CommandCollection.Length) + Me.CommandCollection(i).Transaction = Me._transaction + i = (i + 1) + Loop + If ((Not (Me.Adapter) Is Nothing) _ + AndAlso (Not (Me.Adapter.DeleteCommand) Is Nothing)) Then + Me.Adapter.DeleteCommand.Transaction = Me._transaction + End If + If ((Not (Me.Adapter) Is Nothing) _ + AndAlso (Not (Me.Adapter.InsertCommand) Is Nothing)) Then + Me.Adapter.InsertCommand.Transaction = Me._transaction + End If + If ((Not (Me.Adapter) Is Nothing) _ + AndAlso (Not (Me.Adapter.UpdateCommand) Is Nothing)) Then + Me.Adapter.UpdateCommand.Transaction = Me._transaction + End If + End Set + End Property + + _ + Protected ReadOnly Property CommandCollection() As Global.System.Data.SqlClient.SqlCommand() + Get + If (Me._commandCollection Is Nothing) Then + Me.InitCommandCollection + End If + Return Me._commandCollection + End Get + End Property + + _ + Public Property ClearBeforeFill() As Boolean + Get + Return Me._clearBeforeFill + End Get + Set + Me._clearBeforeFill = value + End Set + End Property + + _ + Private Sub InitAdapter() + Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() + Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() + tableMapping.SourceTable = "Table" + tableMapping.DataSetTable = "TBCW_PROFILES" + tableMapping.ColumnMappings.Add("GUID", "GUID") + tableMapping.ColumnMappings.Add("NAME", "NAME") + tableMapping.ColumnMappings.Add("COMMENT", "COMMENT") + tableMapping.ColumnMappings.Add("REGEX_EXPRESSION", "REGEX_EXPRESSION") + tableMapping.ColumnMappings.Add("ADDED_WHO", "ADDED_WHO") + tableMapping.ColumnMappings.Add("ADDED_WHEN", "ADDED_WHEN") + tableMapping.ColumnMappings.Add("CHANGED_WHO", "CHANGED_WHO") + tableMapping.ColumnMappings.Add("CHANGED_WHEN", "CHANGED_WHEN") + tableMapping.ColumnMappings.Add("ACTIVE", "ACTIVE") + tableMapping.ColumnMappings.Add("PROFILE_TYPE", "PROFILE_TYPE") + Me._adapter.TableMappings.Add(tableMapping) + Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() + Me._adapter.DeleteCommand.Connection = Me.Connection + Me._adapter.DeleteCommand.CommandText = "DELETE FROM [dbo].[TBCW_PROFILES] WHERE (([GUID] = @Original_GUID) AND ([NAME] = "& _ + "@Original_NAME) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] ="& _ + " @Original_COMMENT)) AND ([REGEX_EXPRESSION] = @Original_REGEX_EXPRESSION) AND ("& _ + "[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] = @Origin"& _ + "al_CHANGED_WHEN)) AND ([ACTIVE] = @Original_ACTIVE) AND ([PROFILE_TYPE] = @Origi"& _ + "nal_PROFILE_TYPE))" + Me._adapter.DeleteCommand.CommandType = Global.System.Data.CommandType.Text + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_COMMENT", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_REGEX_EXPRESSION", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_EXPRESSION", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_ADDED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHO", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ACTIVE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PROFILE_TYPE", Global.System.Data.SqlDbType.SmallInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_TYPE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand() + Me._adapter.InsertCommand.Connection = Me.Connection + Me._adapter.InsertCommand.CommandText = "INSERT INTO [dbo].[TBCW_PROFILES] ([NAME], [COMMENT], [REGEX_EXPRESSION], [ADDED_"& _ + "WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN], [ACTIVE], [PROFILE_TYPE]) VAL"& _ + "UES (@NAME, @COMMENT, @REGEX_EXPRESSION, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, "& _ + "@CHANGED_WHEN, @ACTIVE, @PROFILE_TYPE);"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, NAME, COMMENT, REGEX_EXPRE"& _ + "SSION, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, ACTIVE, PROFILE_TYPE FR"& _ + "OM TBCW_PROFILES WHERE (GUID = SCOPE_IDENTITY())" + Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX_EXPRESSION", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_EXPRESSION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFILE_TYPE", Global.System.Data.SqlDbType.SmallInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_TYPE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand() + Me._adapter.UpdateCommand.Connection = Me.Connection + Me._adapter.UpdateCommand.CommandText = "UPDATE [dbo].[TBCW_PROFILES] SET [NAME] = @NAME, [COMMENT] = @COMMENT, [REGEX_EXP"& _ + "RESSION] = @REGEX_EXPRESSION, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WH"& _ + "EN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN, [ACTIVE] = @AC"& _ + "TIVE, [PROFILE_TYPE] = @PROFILE_TYPE WHERE (([GUID] = @Original_GUID) AND ([NAME"& _ + "] = @Original_NAME) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMEN"& _ + "T] = @Original_COMMENT)) AND ([REGEX_EXPRESSION] = @Original_REGEX_EXPRESSION) A"& _ + "ND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_W"& _ + "HEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WH"& _ + "O = 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] = @Or"& _ + "iginal_CHANGED_WHEN)) AND ([ACTIVE] = @Original_ACTIVE) AND ([PROFILE_TYPE] = @O"& _ + "riginal_PROFILE_TYPE));"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, NAME, COMMENT, REGEX_EXPRESSION, ADDED_WHO"& _ + ", ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, ACTIVE, PROFILE_TYPE FROM TBCW_PROFILES"& _ + " WHERE (GUID = @GUID)" + Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX_EXPRESSION", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_EXPRESSION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFILE_TYPE", Global.System.Data.SqlDbType.SmallInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_TYPE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_COMMENT", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_REGEX_EXPRESSION", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_EXPRESSION", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_ADDED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHO", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ACTIVE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PROFILE_TYPE", Global.System.Data.SqlDbType.SmallInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_TYPE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + End Sub + + _ + Private Sub InitConnection() + Me._connection = New Global.System.Data.SqlClient.SqlConnection() + Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.DD_ECM_TESTConnectionString + End Sub + + _ + Private Sub InitCommandCollection() + Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {} + Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() + Me._commandCollection(0).Connection = Me.Connection + Me._commandCollection(0).CommandText = "SELECT GUID, NAME, COMMENT, REGEX_EXPRESSION, ADDED_WHO, ADDED_WHEN, CHANGED_WHO,"& _ + " CHANGED_WHEN, ACTIVE, PROFILE_TYPE FROM dbo.TBCW_PROFILES WHERE GUID = @GUID" + Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text + Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + End Sub + + _ + Public Overloads Overridable Function Fill(ByVal dataTable As DBCW_Stammdaten.TBCW_PROFILESDataTable, ByVal GUID As Integer) As Integer + Me.Adapter.SelectCommand = Me.CommandCollection(0) + Me.Adapter.SelectCommand.Parameters(0).Value = CType(GUID,Integer) + If (Me.ClearBeforeFill = true) Then + dataTable.Clear + End If + Dim returnValue As Integer = Me.Adapter.Fill(dataTable) + Return returnValue + End Function + + _ + Public Overloads Overridable Function GetData(ByVal GUID As Integer) As DBCW_Stammdaten.TBCW_PROFILESDataTable + Me.Adapter.SelectCommand = Me.CommandCollection(0) + Me.Adapter.SelectCommand.Parameters(0).Value = CType(GUID,Integer) + Dim dataTable As DBCW_Stammdaten.TBCW_PROFILESDataTable = New DBCW_Stammdaten.TBCW_PROFILESDataTable() + Me.Adapter.Fill(dataTable) + Return dataTable + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataTable As DBCW_Stammdaten.TBCW_PROFILESDataTable) As Integer + Return Me.Adapter.Update(dataTable) + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataSet As DBCW_Stammdaten) As Integer + Return Me.Adapter.Update(dataSet, "TBCW_PROFILES") + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataRow As Global.System.Data.DataRow) As Integer + Return Me.Adapter.Update(New Global.System.Data.DataRow() {dataRow}) + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataRows() As Global.System.Data.DataRow) As Integer + Return Me.Adapter.Update(dataRows) + End Function + + _ + Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer, ByVal Original_NAME As String, ByVal Original_COMMENT As String, ByVal Original_REGEX_EXPRESSION As String, ByVal Original_ADDED_WHO As String, ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), ByVal Original_CHANGED_WHO As String, ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date), ByVal Original_ACTIVE As Boolean, ByVal Original_PROFILE_TYPE As Short) As Integer + Me.Adapter.DeleteCommand.Parameters(0).Value = CType(Original_GUID,Integer) + If (Original_NAME Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_NAME") + Else + Me.Adapter.DeleteCommand.Parameters(1).Value = CType(Original_NAME,String) + End If + If (Original_COMMENT Is Nothing) Then + Me.Adapter.DeleteCommand.Parameters(2).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(3).Value = Global.System.DBNull.Value + Else + Me.Adapter.DeleteCommand.Parameters(2).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(3).Value = CType(Original_COMMENT,String) + End If + If (Original_REGEX_EXPRESSION Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_REGEX_EXPRESSION") + Else + Me.Adapter.DeleteCommand.Parameters(4).Value = CType(Original_REGEX_EXPRESSION,String) + End If + If (Original_ADDED_WHO Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_ADDED_WHO") + Else + Me.Adapter.DeleteCommand.Parameters(5).Value = CType(Original_ADDED_WHO,String) + End If + If (Original_ADDED_WHEN.HasValue = true) Then + Me.Adapter.DeleteCommand.Parameters(6).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(7).Value = CType(Original_ADDED_WHEN.Value,Date) + Else + Me.Adapter.DeleteCommand.Parameters(6).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(7).Value = Global.System.DBNull.Value + End If + If (Original_CHANGED_WHO Is Nothing) Then + Me.Adapter.DeleteCommand.Parameters(8).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(9).Value = Global.System.DBNull.Value + Else + Me.Adapter.DeleteCommand.Parameters(8).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(9).Value = CType(Original_CHANGED_WHO,String) + End If + If (Original_CHANGED_WHEN.HasValue = true) Then + Me.Adapter.DeleteCommand.Parameters(10).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(11).Value = CType(Original_CHANGED_WHEN.Value,Date) + Else + Me.Adapter.DeleteCommand.Parameters(10).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(11).Value = Global.System.DBNull.Value + End If + Me.Adapter.DeleteCommand.Parameters(12).Value = CType(Original_ACTIVE,Boolean) + Me.Adapter.DeleteCommand.Parameters(13).Value = CType(Original_PROFILE_TYPE,Short) + Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.DeleteCommand.Connection.State + If ((Me.Adapter.DeleteCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ + <> Global.System.Data.ConnectionState.Open) Then + Me.Adapter.DeleteCommand.Connection.Open + End If + Try + Dim returnValue As Integer = Me.Adapter.DeleteCommand.ExecuteNonQuery + Return returnValue + Finally + If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then + Me.Adapter.DeleteCommand.Connection.Close + End If + End Try + End Function + + _ + Public Overloads Overridable Function Insert(ByVal NAME As String, ByVal COMMENT As String, ByVal REGEX_EXPRESSION 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 ACTIVE As Boolean, ByVal PROFILE_TYPE As Short) As Integer + If (NAME Is Nothing) Then + Throw New Global.System.ArgumentNullException("NAME") + Else + Me.Adapter.InsertCommand.Parameters(0).Value = CType(NAME,String) + End If + If (COMMENT Is Nothing) Then + Me.Adapter.InsertCommand.Parameters(1).Value = Global.System.DBNull.Value + Else + Me.Adapter.InsertCommand.Parameters(1).Value = CType(COMMENT,String) + End If + If (REGEX_EXPRESSION Is Nothing) Then + Throw New Global.System.ArgumentNullException("REGEX_EXPRESSION") + Else + Me.Adapter.InsertCommand.Parameters(2).Value = CType(REGEX_EXPRESSION,String) + End If + If (ADDED_WHO Is Nothing) Then + Throw New Global.System.ArgumentNullException("ADDED_WHO") + Else + Me.Adapter.InsertCommand.Parameters(3).Value = CType(ADDED_WHO,String) + End If + If (ADDED_WHEN.HasValue = true) Then + Me.Adapter.InsertCommand.Parameters(4).Value = CType(ADDED_WHEN.Value,Date) + Else + Me.Adapter.InsertCommand.Parameters(4).Value = Global.System.DBNull.Value + End If + If (CHANGED_WHO Is Nothing) Then + Me.Adapter.InsertCommand.Parameters(5).Value = Global.System.DBNull.Value + Else + Me.Adapter.InsertCommand.Parameters(5).Value = CType(CHANGED_WHO,String) + End If + If (CHANGED_WHEN.HasValue = true) Then + Me.Adapter.InsertCommand.Parameters(6).Value = CType(CHANGED_WHEN.Value,Date) + Else + Me.Adapter.InsertCommand.Parameters(6).Value = Global.System.DBNull.Value + End If + Me.Adapter.InsertCommand.Parameters(7).Value = CType(ACTIVE,Boolean) + Me.Adapter.InsertCommand.Parameters(8).Value = CType(PROFILE_TYPE,Short) + Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State + If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ + <> Global.System.Data.ConnectionState.Open) Then + Me.Adapter.InsertCommand.Connection.Open + End If + Try + Dim returnValue As Integer = Me.Adapter.InsertCommand.ExecuteNonQuery + Return returnValue + Finally + If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then + Me.Adapter.InsertCommand.Connection.Close + End If + End Try + End Function + + _ + Public Overloads Overridable Function Update( _ + ByVal NAME As String, _ + ByVal COMMENT As String, _ + ByVal REGEX_EXPRESSION 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 ACTIVE As Boolean, _ + ByVal PROFILE_TYPE As Short, _ + ByVal Original_GUID As Integer, _ + ByVal Original_NAME As String, _ + ByVal Original_COMMENT As String, _ + ByVal Original_REGEX_EXPRESSION As String, _ + ByVal Original_ADDED_WHO As String, _ + ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), _ + ByVal Original_CHANGED_WHO As String, _ + ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date), _ + ByVal Original_ACTIVE As Boolean, _ + ByVal Original_PROFILE_TYPE As Short, _ + ByVal GUID As Integer) As Integer + If (NAME Is Nothing) Then + Throw New Global.System.ArgumentNullException("NAME") + Else + Me.Adapter.UpdateCommand.Parameters(0).Value = CType(NAME,String) + End If + If (COMMENT Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(1).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(1).Value = CType(COMMENT,String) + End If + If (REGEX_EXPRESSION Is Nothing) Then + Throw New Global.System.ArgumentNullException("REGEX_EXPRESSION") + Else + Me.Adapter.UpdateCommand.Parameters(2).Value = CType(REGEX_EXPRESSION,String) + End If + If (ADDED_WHO Is Nothing) Then + Throw New Global.System.ArgumentNullException("ADDED_WHO") + Else + Me.Adapter.UpdateCommand.Parameters(3).Value = CType(ADDED_WHO,String) + End If + If (ADDED_WHEN.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(4).Value = CType(ADDED_WHEN.Value,Date) + Else + Me.Adapter.UpdateCommand.Parameters(4).Value = Global.System.DBNull.Value + End If + If (CHANGED_WHO Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(5).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(5).Value = CType(CHANGED_WHO,String) + End If + If (CHANGED_WHEN.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(6).Value = CType(CHANGED_WHEN.Value,Date) + Else + Me.Adapter.UpdateCommand.Parameters(6).Value = Global.System.DBNull.Value + End If + Me.Adapter.UpdateCommand.Parameters(7).Value = CType(ACTIVE,Boolean) + Me.Adapter.UpdateCommand.Parameters(8).Value = CType(PROFILE_TYPE,Short) + Me.Adapter.UpdateCommand.Parameters(9).Value = CType(Original_GUID,Integer) + If (Original_NAME Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_NAME") + Else + Me.Adapter.UpdateCommand.Parameters(10).Value = CType(Original_NAME,String) + End If + If (Original_COMMENT Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(11).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(12).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(11).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(12).Value = CType(Original_COMMENT,String) + End If + If (Original_REGEX_EXPRESSION Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_REGEX_EXPRESSION") + Else + Me.Adapter.UpdateCommand.Parameters(13).Value = CType(Original_REGEX_EXPRESSION,String) + End If + If (Original_ADDED_WHO Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_ADDED_WHO") + Else + Me.Adapter.UpdateCommand.Parameters(14).Value = CType(Original_ADDED_WHO,String) + End If + If (Original_ADDED_WHEN.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(15).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(16).Value = CType(Original_ADDED_WHEN.Value,Date) + Else + Me.Adapter.UpdateCommand.Parameters(15).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(16).Value = Global.System.DBNull.Value + End If + If (Original_CHANGED_WHO Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(17).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(18).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(17).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(18).Value = CType(Original_CHANGED_WHO,String) + End If + If (Original_CHANGED_WHEN.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(19).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(20).Value = CType(Original_CHANGED_WHEN.Value,Date) + Else + Me.Adapter.UpdateCommand.Parameters(19).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(20).Value = Global.System.DBNull.Value + End If + Me.Adapter.UpdateCommand.Parameters(21).Value = CType(Original_ACTIVE,Boolean) + Me.Adapter.UpdateCommand.Parameters(22).Value = CType(Original_PROFILE_TYPE,Short) + Me.Adapter.UpdateCommand.Parameters(23).Value = CType(GUID,Integer) + Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State + If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ + <> Global.System.Data.ConnectionState.Open) Then + Me.Adapter.UpdateCommand.Connection.Open + End If + Try + Dim returnValue As Integer = Me.Adapter.UpdateCommand.ExecuteNonQuery + Return returnValue + Finally + If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then + Me.Adapter.UpdateCommand.Connection.Close + End If + End Try + End Function + + _ + Public Overloads Overridable Function Update( _ + ByVal NAME As String, _ + ByVal COMMENT As String, _ + ByVal REGEX_EXPRESSION 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 ACTIVE As Boolean, _ + ByVal PROFILE_TYPE As Short, _ + ByVal Original_GUID As Integer, _ + ByVal Original_NAME As String, _ + ByVal Original_COMMENT As String, _ + ByVal Original_REGEX_EXPRESSION As String, _ + ByVal Original_ADDED_WHO As String, _ + ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), _ + ByVal Original_CHANGED_WHO As String, _ + ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date), _ + ByVal Original_ACTIVE As Boolean, _ + ByVal Original_PROFILE_TYPE As Short) As Integer + Return Me.Update(NAME, COMMENT, REGEX_EXPRESSION, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, ACTIVE, PROFILE_TYPE, Original_GUID, Original_NAME, Original_COMMENT, Original_REGEX_EXPRESSION, Original_ADDED_WHO, Original_ADDED_WHEN, Original_CHANGED_WHO, Original_CHANGED_WHEN, Original_ACTIVE, Original_PROFILE_TYPE, Original_GUID) + End Function + End Class + + ''' + '''Represents the connection and commands used to retrieve and save data. + ''' + _ + Partial Public Class TBCW_PROF_DOC_SEARCHTableAdapter + Inherits Global.System.ComponentModel.Component + + Private WithEvents _adapter As Global.System.Data.SqlClient.SqlDataAdapter + + Private _connection As Global.System.Data.SqlClient.SqlConnection + + Private _transaction As Global.System.Data.SqlClient.SqlTransaction + + Private _commandCollection() As Global.System.Data.SqlClient.SqlCommand + + Private _clearBeforeFill As Boolean + + _ + Public Sub New() MyBase.New - Me.eventRow = row - Me.eventAction = action + Me.ClearBeforeFill = true + End Sub + + _ + Protected Friend ReadOnly Property Adapter() As Global.System.Data.SqlClient.SqlDataAdapter + Get + If (Me._adapter Is Nothing) Then + Me.InitAdapter + End If + Return Me._adapter + End Get + End Property + + _ + Friend Property Connection() As Global.System.Data.SqlClient.SqlConnection + Get + If (Me._connection Is Nothing) Then + Me.InitConnection + End If + Return Me._connection + End Get + Set + Me._connection = value + If (Not (Me.Adapter.InsertCommand) Is Nothing) Then + Me.Adapter.InsertCommand.Connection = value + End If + If (Not (Me.Adapter.DeleteCommand) Is Nothing) Then + Me.Adapter.DeleteCommand.Connection = value + End If + If (Not (Me.Adapter.UpdateCommand) Is Nothing) Then + Me.Adapter.UpdateCommand.Connection = value + End If + Dim i As Integer = 0 + Do While (i < Me.CommandCollection.Length) + If (Not (Me.CommandCollection(i)) Is Nothing) Then + CType(Me.CommandCollection(i),Global.System.Data.SqlClient.SqlCommand).Connection = value + End If + i = (i + 1) + Loop + End Set + End Property + + _ + Friend Property Transaction() As Global.System.Data.SqlClient.SqlTransaction + Get + Return Me._transaction + End Get + Set + Me._transaction = value + Dim i As Integer = 0 + Do While (i < Me.CommandCollection.Length) + Me.CommandCollection(i).Transaction = Me._transaction + i = (i + 1) + Loop + If ((Not (Me.Adapter) Is Nothing) _ + AndAlso (Not (Me.Adapter.DeleteCommand) Is Nothing)) Then + Me.Adapter.DeleteCommand.Transaction = Me._transaction + End If + If ((Not (Me.Adapter) Is Nothing) _ + AndAlso (Not (Me.Adapter.InsertCommand) Is Nothing)) Then + Me.Adapter.InsertCommand.Transaction = Me._transaction + End If + If ((Not (Me.Adapter) Is Nothing) _ + AndAlso (Not (Me.Adapter.UpdateCommand) Is Nothing)) Then + Me.Adapter.UpdateCommand.Transaction = Me._transaction + End If + End Set + End Property + + _ + Protected ReadOnly Property CommandCollection() As Global.System.Data.SqlClient.SqlCommand() + Get + If (Me._commandCollection Is Nothing) Then + Me.InitCommandCollection + End If + Return Me._commandCollection + End Get + End Property + + _ + Public Property ClearBeforeFill() As Boolean + Get + Return Me._clearBeforeFill + End Get + Set + Me._clearBeforeFill = value + End Set + End Property + + _ + Private Sub InitAdapter() + Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() + Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() + tableMapping.SourceTable = "Table" + tableMapping.DataSetTable = "TBCW_PROF_DOC_SEARCH" + tableMapping.ColumnMappings.Add("GUID", "GUID") + tableMapping.ColumnMappings.Add("PROFILE_ID", "PROFILE_ID") + tableMapping.ColumnMappings.Add("CONN_ID", "CONN_ID") + tableMapping.ColumnMappings.Add("SQL_COMMAND", "SQL_COMMAND") + tableMapping.ColumnMappings.Add("TAB_INDEX", "TAB_INDEX") + tableMapping.ColumnMappings.Add("ACTIVE", "ACTIVE") + tableMapping.ColumnMappings.Add("TAB_TITLE", "TAB_TITLE") + tableMapping.ColumnMappings.Add("ADDED_WHO", "ADDED_WHO") + tableMapping.ColumnMappings.Add("ADDED_WHEN", "ADDED_WHEN") + tableMapping.ColumnMappings.Add("CHANGED_WHO", "CHANGED_WHO") + tableMapping.ColumnMappings.Add("CHANGED_WHEN", "CHANGED_WHEN") + tableMapping.ColumnMappings.Add("COUNT_COMMAND", "COUNT_COMMAND") + Me._adapter.TableMappings.Add(tableMapping) + Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() + Me._adapter.DeleteCommand.Connection = Me.Connection + Me._adapter.DeleteCommand.CommandText = "DELETE FROM [TBCW_PROF_DOC_SEARCH] WHERE (([GUID] = @Original_GUID) AND ([PROFILE"& _ + "_ID] = @Original_PROFILE_ID) AND ([CONN_ID] = @Original_CONN_ID) AND ([TAB_INDEX"& _ + "] = @Original_TAB_INDEX) AND ([ACTIVE] = @Original_ACTIVE) AND ([TAB_TITLE] = @O"& _ + "riginal_TAB_TITLE) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_W"& _ + "HEN = 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] = @Origin"& _ + "al_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ("& _ + "[CHANGED_WHEN] = @Original_CHANGED_WHEN)))" + Me._adapter.DeleteCommand.CommandType = Global.System.Data.CommandType.Text + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PROFILE_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CONN_ID", Global.System.Data.SqlDbType.TinyInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CONN_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_TAB_INDEX", Global.System.Data.SqlDbType.TinyInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "TAB_INDEX", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ACTIVE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_TAB_TITLE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "TAB_TITLE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_ADDED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHO", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand() + Me._adapter.InsertCommand.Connection = Me.Connection + Me._adapter.InsertCommand.CommandText = "INSERT INTO [TBCW_PROF_DOC_SEARCH] ([PROFILE_ID], [CONN_ID], [SQL_COMMAND], [TAB_"& _ + "INDEX], [ACTIVE], [TAB_TITLE], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGE"& _ + "D_WHEN], [COUNT_COMMAND]) VALUES (@PROFILE_ID, @CONN_ID, @SQL_COMMAND, @TAB_INDE"& _ + "X, @ACTIVE, @TAB_TITLE, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN, @C"& _ + "OUNT_COMMAND);"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFILE_ID, CONN_ID, SQL_COMMAND, TAB_INDEX, ACTIVE"& _ + ", TAB_TITLE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COUNT_COMMAND FRO"& _ + "M TBCW_PROF_DOC_SEARCH WHERE (GUID = SCOPE_IDENTITY())" + Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFILE_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONN_ID", Global.System.Data.SqlDbType.TinyInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CONN_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_COMMAND", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_COMMAND", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TAB_INDEX", Global.System.Data.SqlDbType.TinyInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "TAB_INDEX", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TAB_TITLE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "TAB_TITLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COUNT_COMMAND", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COUNT_COMMAND", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand() + Me._adapter.UpdateCommand.Connection = Me.Connection + Me._adapter.UpdateCommand.CommandText = "UPDATE [TBCW_PROF_DOC_SEARCH] SET [PROFILE_ID] = @PROFILE_ID, [CONN_ID] = @CONN_I"& _ + "D, [SQL_COMMAND] = @SQL_COMMAND, [TAB_INDEX] = @TAB_INDEX, [ACTIVE] = @ACTIVE, ["& _ + "TAB_TITLE] = @TAB_TITLE, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, ["& _ + "CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN, [COUNT_COMMAND] = @"& _ + "COUNT_COMMAND WHERE (([GUID] = @Original_GUID) AND ([PROFILE_ID] = @Original_PRO"& _ + "FILE_ID) AND ([CONN_ID] = @Original_CONN_ID) AND ([TAB_INDEX] = @Original_TAB_IN"& _ + "DEX) AND ([ACTIVE] = @Original_ACTIVE) AND ([TAB_TITLE] = @Original_TAB_TITLE) A"& _ + "ND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_W"& _ + "HEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WH"& _ + "O = 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] = @Or"& _ + "iginal_CHANGED_WHEN)));"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFILE_ID, CONN_ID, SQL_COMMAND, TAB_INDE"& _ + "X, ACTIVE, TAB_TITLE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COUNT_CO"& _ + "MMAND FROM TBCW_PROF_DOC_SEARCH WHERE (GUID = @GUID)" + Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFILE_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONN_ID", Global.System.Data.SqlDbType.TinyInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CONN_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_COMMAND", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_COMMAND", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TAB_INDEX", Global.System.Data.SqlDbType.TinyInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "TAB_INDEX", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TAB_TITLE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "TAB_TITLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COUNT_COMMAND", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COUNT_COMMAND", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PROFILE_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CONN_ID", Global.System.Data.SqlDbType.TinyInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CONN_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_TAB_INDEX", Global.System.Data.SqlDbType.TinyInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "TAB_INDEX", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ACTIVE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_TAB_TITLE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "TAB_TITLE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_ADDED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHO", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) End Sub _ - Public ReadOnly Property Row() As TBCW_PROFILESRow - Get - Return Me.eventRow - End Get - End Property + Private Sub InitConnection() + Me._connection = New Global.System.Data.SqlClient.SqlConnection() + Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.DD_ECM_TESTConnectionString + End Sub _ - Public ReadOnly Property Action() As Global.System.Data.DataRowAction - Get - Return Me.eventAction - End Get - End Property + Private Sub InitCommandCollection() + Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {} + Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() + Me._commandCollection(0).Connection = Me.Connection + Me._commandCollection(0).CommandText = "SELECT TBCW_PROF_DOC_SEARCH.*"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBCW_PROF_DOC_SEARCH WHERE "& _ + "PROFILE_ID = @PROFILE_ID" + Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text + Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFILE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + End Sub + + _ + Public Overloads Overridable Function Fill(ByVal dataTable As DBCW_Stammdaten.TBCW_PROF_DOC_SEARCHDataTable, ByVal PROFILE_ID As Integer) As Integer + Me.Adapter.SelectCommand = Me.CommandCollection(0) + Me.Adapter.SelectCommand.Parameters(0).Value = CType(PROFILE_ID,Integer) + If (Me.ClearBeforeFill = true) Then + dataTable.Clear + End If + Dim returnValue As Integer = Me.Adapter.Fill(dataTable) + Return returnValue + End Function + + _ + Public Overloads Overridable Function GetData(ByVal PROFILE_ID As Integer) As DBCW_Stammdaten.TBCW_PROF_DOC_SEARCHDataTable + Me.Adapter.SelectCommand = Me.CommandCollection(0) + Me.Adapter.SelectCommand.Parameters(0).Value = CType(PROFILE_ID,Integer) + Dim dataTable As DBCW_Stammdaten.TBCW_PROF_DOC_SEARCHDataTable = New DBCW_Stammdaten.TBCW_PROF_DOC_SEARCHDataTable() + Me.Adapter.Fill(dataTable) + Return dataTable + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataTable As DBCW_Stammdaten.TBCW_PROF_DOC_SEARCHDataTable) As Integer + Return Me.Adapter.Update(dataTable) + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataSet As DBCW_Stammdaten) As Integer + Return Me.Adapter.Update(dataSet, "TBCW_PROF_DOC_SEARCH") + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataRow As Global.System.Data.DataRow) As Integer + Return Me.Adapter.Update(New Global.System.Data.DataRow() {dataRow}) + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataRows() As Global.System.Data.DataRow) As Integer + Return Me.Adapter.Update(dataRows) + End Function + + _ + Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer, ByVal Original_PROFILE_ID As Integer, ByVal Original_CONN_ID As Byte, ByVal Original_TAB_INDEX As Byte, ByVal Original_ACTIVE As Boolean, ByVal Original_TAB_TITLE As String, ByVal Original_ADDED_WHO As String, ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), ByVal Original_CHANGED_WHO As String, ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date)) As Integer + Me.Adapter.DeleteCommand.Parameters(0).Value = CType(Original_GUID,Integer) + Me.Adapter.DeleteCommand.Parameters(1).Value = CType(Original_PROFILE_ID,Integer) + Me.Adapter.DeleteCommand.Parameters(2).Value = CType(Original_CONN_ID,Byte) + Me.Adapter.DeleteCommand.Parameters(3).Value = CType(Original_TAB_INDEX,Byte) + Me.Adapter.DeleteCommand.Parameters(4).Value = CType(Original_ACTIVE,Boolean) + If (Original_TAB_TITLE Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_TAB_TITLE") + Else + Me.Adapter.DeleteCommand.Parameters(5).Value = CType(Original_TAB_TITLE,String) + End If + If (Original_ADDED_WHO Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_ADDED_WHO") + Else + Me.Adapter.DeleteCommand.Parameters(6).Value = CType(Original_ADDED_WHO,String) + End If + If (Original_ADDED_WHEN.HasValue = true) Then + Me.Adapter.DeleteCommand.Parameters(7).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(8).Value = CType(Original_ADDED_WHEN.Value,Date) + Else + Me.Adapter.DeleteCommand.Parameters(7).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(8).Value = Global.System.DBNull.Value + End If + If (Original_CHANGED_WHO Is Nothing) Then + Me.Adapter.DeleteCommand.Parameters(9).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(10).Value = Global.System.DBNull.Value + Else + Me.Adapter.DeleteCommand.Parameters(9).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(10).Value = CType(Original_CHANGED_WHO,String) + End If + If (Original_CHANGED_WHEN.HasValue = true) Then + Me.Adapter.DeleteCommand.Parameters(11).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(12).Value = CType(Original_CHANGED_WHEN.Value,Date) + Else + Me.Adapter.DeleteCommand.Parameters(11).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(12).Value = Global.System.DBNull.Value + End If + Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.DeleteCommand.Connection.State + If ((Me.Adapter.DeleteCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ + <> Global.System.Data.ConnectionState.Open) Then + Me.Adapter.DeleteCommand.Connection.Open + End If + Try + Dim returnValue As Integer = Me.Adapter.DeleteCommand.ExecuteNonQuery + Return returnValue + Finally + If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then + Me.Adapter.DeleteCommand.Connection.Close + End If + End Try + End Function + + _ + Public Overloads Overridable Function Insert(ByVal PROFILE_ID As Integer, ByVal CONN_ID As Byte, ByVal SQL_COMMAND As String, ByVal TAB_INDEX As Byte, ByVal ACTIVE As Boolean, ByVal TAB_TITLE 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 COUNT_COMMAND As String) As Integer + Me.Adapter.InsertCommand.Parameters(0).Value = CType(PROFILE_ID,Integer) + Me.Adapter.InsertCommand.Parameters(1).Value = CType(CONN_ID,Byte) + If (SQL_COMMAND Is Nothing) Then + Throw New Global.System.ArgumentNullException("SQL_COMMAND") + Else + Me.Adapter.InsertCommand.Parameters(2).Value = CType(SQL_COMMAND,String) + End If + Me.Adapter.InsertCommand.Parameters(3).Value = CType(TAB_INDEX,Byte) + Me.Adapter.InsertCommand.Parameters(4).Value = CType(ACTIVE,Boolean) + If (TAB_TITLE Is Nothing) Then + Throw New Global.System.ArgumentNullException("TAB_TITLE") + Else + Me.Adapter.InsertCommand.Parameters(5).Value = CType(TAB_TITLE,String) + End If + If (ADDED_WHO Is Nothing) Then + Throw New Global.System.ArgumentNullException("ADDED_WHO") + Else + Me.Adapter.InsertCommand.Parameters(6).Value = CType(ADDED_WHO,String) + End If + If (ADDED_WHEN.HasValue = true) Then + Me.Adapter.InsertCommand.Parameters(7).Value = CType(ADDED_WHEN.Value,Date) + Else + Me.Adapter.InsertCommand.Parameters(7).Value = Global.System.DBNull.Value + End If + If (CHANGED_WHO Is Nothing) Then + Me.Adapter.InsertCommand.Parameters(8).Value = Global.System.DBNull.Value + Else + Me.Adapter.InsertCommand.Parameters(8).Value = CType(CHANGED_WHO,String) + End If + If (CHANGED_WHEN.HasValue = true) Then + Me.Adapter.InsertCommand.Parameters(9).Value = CType(CHANGED_WHEN.Value,Date) + Else + Me.Adapter.InsertCommand.Parameters(9).Value = Global.System.DBNull.Value + End If + If (COUNT_COMMAND Is Nothing) Then + Me.Adapter.InsertCommand.Parameters(10).Value = Global.System.DBNull.Value + Else + Me.Adapter.InsertCommand.Parameters(10).Value = CType(COUNT_COMMAND,String) + End If + Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State + If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ + <> Global.System.Data.ConnectionState.Open) Then + Me.Adapter.InsertCommand.Connection.Open + End If + Try + Dim returnValue As Integer = Me.Adapter.InsertCommand.ExecuteNonQuery + Return returnValue + Finally + If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then + Me.Adapter.InsertCommand.Connection.Close + End If + End Try + End Function + + _ + Public Overloads Overridable Function Update( _ + ByVal PROFILE_ID As Integer, _ + ByVal CONN_ID As Byte, _ + ByVal SQL_COMMAND As String, _ + ByVal TAB_INDEX As Byte, _ + ByVal ACTIVE As Boolean, _ + ByVal TAB_TITLE 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 COUNT_COMMAND As String, _ + ByVal Original_GUID As Integer, _ + ByVal Original_PROFILE_ID As Integer, _ + ByVal Original_CONN_ID As Byte, _ + ByVal Original_TAB_INDEX As Byte, _ + ByVal Original_ACTIVE As Boolean, _ + ByVal Original_TAB_TITLE As String, _ + ByVal Original_ADDED_WHO As String, _ + ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), _ + ByVal Original_CHANGED_WHO As String, _ + ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date), _ + ByVal GUID As Integer) As Integer + Me.Adapter.UpdateCommand.Parameters(0).Value = CType(PROFILE_ID,Integer) + Me.Adapter.UpdateCommand.Parameters(1).Value = CType(CONN_ID,Byte) + If (SQL_COMMAND Is Nothing) Then + Throw New Global.System.ArgumentNullException("SQL_COMMAND") + Else + Me.Adapter.UpdateCommand.Parameters(2).Value = CType(SQL_COMMAND,String) + End If + Me.Adapter.UpdateCommand.Parameters(3).Value = CType(TAB_INDEX,Byte) + Me.Adapter.UpdateCommand.Parameters(4).Value = CType(ACTIVE,Boolean) + If (TAB_TITLE Is Nothing) Then + Throw New Global.System.ArgumentNullException("TAB_TITLE") + Else + Me.Adapter.UpdateCommand.Parameters(5).Value = CType(TAB_TITLE,String) + End If + If (ADDED_WHO Is Nothing) Then + Throw New Global.System.ArgumentNullException("ADDED_WHO") + Else + Me.Adapter.UpdateCommand.Parameters(6).Value = CType(ADDED_WHO,String) + End If + If (ADDED_WHEN.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(7).Value = CType(ADDED_WHEN.Value,Date) + Else + Me.Adapter.UpdateCommand.Parameters(7).Value = Global.System.DBNull.Value + End If + If (CHANGED_WHO Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(8).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(8).Value = CType(CHANGED_WHO,String) + End If + If (CHANGED_WHEN.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(9).Value = CType(CHANGED_WHEN.Value,Date) + Else + Me.Adapter.UpdateCommand.Parameters(9).Value = Global.System.DBNull.Value + End If + If (COUNT_COMMAND Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(10).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(10).Value = CType(COUNT_COMMAND,String) + End If + Me.Adapter.UpdateCommand.Parameters(11).Value = CType(Original_GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(12).Value = CType(Original_PROFILE_ID,Integer) + Me.Adapter.UpdateCommand.Parameters(13).Value = CType(Original_CONN_ID,Byte) + Me.Adapter.UpdateCommand.Parameters(14).Value = CType(Original_TAB_INDEX,Byte) + Me.Adapter.UpdateCommand.Parameters(15).Value = CType(Original_ACTIVE,Boolean) + If (Original_TAB_TITLE Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_TAB_TITLE") + Else + Me.Adapter.UpdateCommand.Parameters(16).Value = CType(Original_TAB_TITLE,String) + End If + If (Original_ADDED_WHO Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_ADDED_WHO") + Else + Me.Adapter.UpdateCommand.Parameters(17).Value = CType(Original_ADDED_WHO,String) + End If + If (Original_ADDED_WHEN.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(18).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(19).Value = CType(Original_ADDED_WHEN.Value,Date) + Else + Me.Adapter.UpdateCommand.Parameters(18).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(19).Value = Global.System.DBNull.Value + End If + If (Original_CHANGED_WHO Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(20).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(21).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(20).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(21).Value = CType(Original_CHANGED_WHO,String) + End If + If (Original_CHANGED_WHEN.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(22).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(23).Value = CType(Original_CHANGED_WHEN.Value,Date) + Else + Me.Adapter.UpdateCommand.Parameters(22).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(23).Value = Global.System.DBNull.Value + End If + Me.Adapter.UpdateCommand.Parameters(24).Value = CType(GUID,Integer) + Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State + If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ + <> Global.System.Data.ConnectionState.Open) Then + Me.Adapter.UpdateCommand.Connection.Open + End If + Try + Dim returnValue As Integer = Me.Adapter.UpdateCommand.ExecuteNonQuery + Return returnValue + Finally + If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then + Me.Adapter.UpdateCommand.Connection.Close + End If + End Try + End Function + + _ + Public Overloads Overridable Function Update( _ + ByVal PROFILE_ID As Integer, _ + ByVal CONN_ID As Byte, _ + ByVal SQL_COMMAND As String, _ + ByVal TAB_INDEX As Byte, _ + ByVal ACTIVE As Boolean, _ + ByVal TAB_TITLE 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 COUNT_COMMAND As String, _ + ByVal Original_GUID As Integer, _ + ByVal Original_PROFILE_ID As Integer, _ + ByVal Original_CONN_ID As Byte, _ + ByVal Original_TAB_INDEX As Byte, _ + ByVal Original_ACTIVE As Boolean, _ + ByVal Original_TAB_TITLE As String, _ + ByVal Original_ADDED_WHO As String, _ + ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), _ + ByVal Original_CHANGED_WHO As String, _ + ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date)) As Integer + Return Me.Update(PROFILE_ID, CONN_ID, SQL_COMMAND, TAB_INDEX, ACTIVE, TAB_TITLE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COUNT_COMMAND, Original_GUID, Original_PROFILE_ID, Original_CONN_ID, Original_TAB_INDEX, Original_ACTIVE, Original_TAB_TITLE, Original_ADDED_WHO, Original_ADDED_WHEN, Original_CHANGED_WHO, Original_CHANGED_WHEN, Original_GUID) + End Function End Class -End Class - -Namespace DBCW_StammdatenTableAdapters ''' '''Represents the connection and commands used to retrieve and save data. @@ -905,7 +3492,7 @@ Namespace DBCW_StammdatenTableAdapters Global.System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner"& _ ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")> _ - Partial Public Class TBCW_PROFILESTableAdapter + Partial Public Class TBCW_PROF_DATA_SEARCHTableAdapter Inherits Global.System.ComponentModel.Component Private WithEvents _adapter As Global.System.Data.SqlClient.SqlDataAdapter @@ -1022,35 +3609,37 @@ Namespace DBCW_StammdatenTableAdapters Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() tableMapping.SourceTable = "Table" - tableMapping.DataSetTable = "TBCW_PROFILES" + tableMapping.DataSetTable = "TBCW_PROF_DATA_SEARCH" tableMapping.ColumnMappings.Add("GUID", "GUID") - tableMapping.ColumnMappings.Add("NAME", "NAME") - tableMapping.ColumnMappings.Add("COMMENT", "COMMENT") - tableMapping.ColumnMappings.Add("REGEX_EXPRESSION", "REGEX_EXPRESSION") + tableMapping.ColumnMappings.Add("PROFILE_ID", "PROFILE_ID") + tableMapping.ColumnMappings.Add("CONN_ID", "CONN_ID") + tableMapping.ColumnMappings.Add("SQL_COMMAND", "SQL_COMMAND") + tableMapping.ColumnMappings.Add("TAB_INDEX", "TAB_INDEX") + tableMapping.ColumnMappings.Add("ACTIVE", "ACTIVE") + tableMapping.ColumnMappings.Add("TAB_TITLE", "TAB_TITLE") tableMapping.ColumnMappings.Add("ADDED_WHO", "ADDED_WHO") tableMapping.ColumnMappings.Add("ADDED_WHEN", "ADDED_WHEN") tableMapping.ColumnMappings.Add("CHANGED_WHO", "CHANGED_WHO") tableMapping.ColumnMappings.Add("CHANGED_WHEN", "CHANGED_WHEN") - tableMapping.ColumnMappings.Add("ACTIVE", "ACTIVE") - tableMapping.ColumnMappings.Add("PROFILE_TYPE", "PROFILE_TYPE") + tableMapping.ColumnMappings.Add("COUNT_COMMAND", "COUNT_COMMAND") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection - Me._adapter.DeleteCommand.CommandText = "DELETE FROM [dbo].[TBCW_PROFILES] WHERE (([GUID] = @Original_GUID) AND ([NAME] = "& _ - "@Original_NAME) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] ="& _ - " @Original_COMMENT)) AND ([REGEX_EXPRESSION] = @Original_REGEX_EXPRESSION) AND ("& _ - "[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] = @Origin"& _ - "al_CHANGED_WHEN)) AND ([ACTIVE] = @Original_ACTIVE) AND ([PROFILE_TYPE] = @Origi"& _ - "nal_PROFILE_TYPE))" + Me._adapter.DeleteCommand.CommandText = "DELETE FROM [TBCW_PROF_DATA_SEARCH] WHERE (([GUID] = @Original_GUID) AND ([PROFIL"& _ + "E_ID] = @Original_PROFILE_ID) AND ([CONN_ID] = @Original_CONN_ID) AND ([TAB_INDE"& _ + "X] = @Original_TAB_INDEX) AND ([ACTIVE] = @Original_ACTIVE) AND ([TAB_TITLE] = @"& _ + "Original_TAB_TITLE) AND ([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] = @Origi"& _ + "nal_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR "& _ + "([CHANGED_WHEN] = @Original_CHANGED_WHEN)))" Me._adapter.DeleteCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_COMMENT", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_REGEX_EXPRESSION", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_EXPRESSION", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PROFILE_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CONN_ID", Global.System.Data.SqlDbType.TinyInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CONN_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_TAB_INDEX", Global.System.Data.SqlDbType.TinyInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "TAB_INDEX", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ACTIVE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_TAB_TITLE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "TAB_TITLE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_ADDED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) @@ -1058,57 +3647,61 @@ Namespace DBCW_StammdatenTableAdapters Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ACTIVE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PROFILE_TYPE", Global.System.Data.SqlDbType.SmallInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_TYPE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.InsertCommand.Connection = Me.Connection - Me._adapter.InsertCommand.CommandText = "INSERT INTO [dbo].[TBCW_PROFILES] ([NAME], [COMMENT], [REGEX_EXPRESSION], [ADDED_"& _ - "WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN], [ACTIVE], [PROFILE_TYPE]) VAL"& _ - "UES (@NAME, @COMMENT, @REGEX_EXPRESSION, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, "& _ - "@CHANGED_WHEN, @ACTIVE, @PROFILE_TYPE);"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, NAME, COMMENT, REGEX_EXPRE"& _ - "SSION, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, ACTIVE, PROFILE_TYPE FR"& _ - "OM TBCW_PROFILES WHERE (GUID = SCOPE_IDENTITY())" + Me._adapter.InsertCommand.CommandText = "INSERT INTO [TBCW_PROF_DATA_SEARCH] ([PROFILE_ID], [CONN_ID], [SQL_COMMAND], [TAB"& _ + "_INDEX], [ACTIVE], [TAB_TITLE], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANG"& _ + "ED_WHEN], [COUNT_COMMAND]) VALUES (@PROFILE_ID, @CONN_ID, @SQL_COMMAND, @TAB_IND"& _ + "EX, @ACTIVE, @TAB_TITLE, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN, @"& _ + "COUNT_COMMAND);"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFILE_ID, CONN_ID, SQL_COMMAND, TAB_INDEX, ACTIV"& _ + "E, TAB_TITLE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COUNT_COMMAND FR"& _ + "OM TBCW_PROF_DATA_SEARCH WHERE (GUID = SCOPE_IDENTITY())" Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX_EXPRESSION", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_EXPRESSION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFILE_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONN_ID", Global.System.Data.SqlDbType.TinyInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CONN_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_COMMAND", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_COMMAND", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TAB_INDEX", Global.System.Data.SqlDbType.TinyInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "TAB_INDEX", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TAB_TITLE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "TAB_TITLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFILE_TYPE", Global.System.Data.SqlDbType.SmallInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_TYPE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COUNT_COMMAND", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COUNT_COMMAND", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.UpdateCommand.Connection = Me.Connection - Me._adapter.UpdateCommand.CommandText = "UPDATE [dbo].[TBCW_PROFILES] SET [NAME] = @NAME, [COMMENT] = @COMMENT, [REGEX_EXP"& _ - "RESSION] = @REGEX_EXPRESSION, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WH"& _ - "EN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN, [ACTIVE] = @AC"& _ - "TIVE, [PROFILE_TYPE] = @PROFILE_TYPE WHERE (([GUID] = @Original_GUID) AND ([NAME"& _ - "] = @Original_NAME) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMEN"& _ - "T] = @Original_COMMENT)) AND ([REGEX_EXPRESSION] = @Original_REGEX_EXPRESSION) A"& _ - "ND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_W"& _ - "HEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WH"& _ - "O = 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] = @Or"& _ - "iginal_CHANGED_WHEN)) AND ([ACTIVE] = @Original_ACTIVE) AND ([PROFILE_TYPE] = @O"& _ - "riginal_PROFILE_TYPE));"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, NAME, COMMENT, REGEX_EXPRESSION, ADDED_WHO"& _ - ", ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, ACTIVE, PROFILE_TYPE FROM TBCW_PROFILES"& _ - " WHERE (GUID = @GUID)" + Me._adapter.UpdateCommand.CommandText = "UPDATE [TBCW_PROF_DATA_SEARCH] SET [PROFILE_ID] = @PROFILE_ID, [CONN_ID] = @CONN_"& _ + "ID, [SQL_COMMAND] = @SQL_COMMAND, [TAB_INDEX] = @TAB_INDEX, [ACTIVE] = @ACTIVE, "& _ + "[TAB_TITLE] = @TAB_TITLE, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, "& _ + "[CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN, [COUNT_COMMAND] = "& _ + "@COUNT_COMMAND WHERE (([GUID] = @Original_GUID) AND ([PROFILE_ID] = @Original_PR"& _ + "OFILE_ID) AND ([CONN_ID] = @Original_CONN_ID) AND ([TAB_INDEX] = @Original_TAB_I"& _ + "NDEX) AND ([ACTIVE] = @Original_ACTIVE) AND ([TAB_TITLE] = @Original_TAB_TITLE) "& _ + "AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_"& _ + "WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_W"& _ + "HO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AN"& _ + "D ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @O"& _ + "riginal_CHANGED_WHEN)));"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFILE_ID, CONN_ID, SQL_COMMAND, TAB_IND"& _ + "EX, ACTIVE, TAB_TITLE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COUNT_C"& _ + "OMMAND FROM TBCW_PROF_DATA_SEARCH WHERE (GUID = @GUID)" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX_EXPRESSION", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_EXPRESSION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFILE_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONN_ID", Global.System.Data.SqlDbType.TinyInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CONN_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_COMMAND", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_COMMAND", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TAB_INDEX", Global.System.Data.SqlDbType.TinyInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "TAB_INDEX", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TAB_TITLE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "TAB_TITLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFILE_TYPE", Global.System.Data.SqlDbType.SmallInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_TYPE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COUNT_COMMAND", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COUNT_COMMAND", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_COMMENT", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_REGEX_EXPRESSION", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_EXPRESSION", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PROFILE_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CONN_ID", Global.System.Data.SqlDbType.TinyInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CONN_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_TAB_INDEX", Global.System.Data.SqlDbType.TinyInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "TAB_INDEX", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ACTIVE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_TAB_TITLE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "TAB_TITLE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_ADDED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) @@ -1116,8 +3709,6 @@ Namespace DBCW_StammdatenTableAdapters Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ACTIVE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PROFILE_TYPE", Global.System.Data.SqlDbType.SmallInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_TYPE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) End Sub @@ -1134,19 +3725,20 @@ Namespace DBCW_StammdatenTableAdapters Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {} Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(0).Connection = Me.Connection - Me._commandCollection(0).CommandText = "SELECT GUID, NAME, COMMENT, REGEX_EXPRESSION, ADDED_WHO, ADDED_WHEN, CHANGED_WHO,"& _ - " CHANGED_WHEN, ACTIVE, PROFILE_TYPE FROM dbo.TBCW_PROFILES WHERE GUID = @GUID" + Me._commandCollection(0).CommandText = "SELECT GUID, PROFILE_ID, CONN_ID, SQL_COMMAND, TAB_INDEX, ACTIVE, TAB_TITL"& _ + "E, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COUNT_COMMAND"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM "& _ + " TBCW_PROF_DATA_SEARCH"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (PROFILE_ID = @PROFILE_ID)" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text - Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFILE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) End Sub _ - Public Overloads Overridable Function Fill(ByVal dataTable As DBCW_Stammdaten.TBCW_PROFILESDataTable, ByVal GUID As Integer) As Integer + Public Overloads Overridable Function Fill(ByVal dataTable As DBCW_Stammdaten.TBCW_PROF_DATA_SEARCHDataTable, ByVal PROFILE_ID As Integer) As Integer Me.Adapter.SelectCommand = Me.CommandCollection(0) - Me.Adapter.SelectCommand.Parameters(0).Value = CType(GUID,Integer) + Me.Adapter.SelectCommand.Parameters(0).Value = CType(PROFILE_ID,Integer) If (Me.ClearBeforeFill = true) Then dataTable.Clear End If @@ -1158,10 +3750,10 @@ Namespace DBCW_StammdatenTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.[Select], true)> _ - Public Overloads Overridable Function GetData(ByVal GUID As Integer) As DBCW_Stammdaten.TBCW_PROFILESDataTable + Public Overloads Overridable Function GetData(ByVal PROFILE_ID As Integer) As DBCW_Stammdaten.TBCW_PROF_DATA_SEARCHDataTable Me.Adapter.SelectCommand = Me.CommandCollection(0) - Me.Adapter.SelectCommand.Parameters(0).Value = CType(GUID,Integer) - Dim dataTable As DBCW_Stammdaten.TBCW_PROFILESDataTable = New DBCW_Stammdaten.TBCW_PROFILESDataTable() + Me.Adapter.SelectCommand.Parameters(0).Value = CType(PROFILE_ID,Integer) + Dim dataTable As DBCW_Stammdaten.TBCW_PROF_DATA_SEARCHDataTable = New DBCW_Stammdaten.TBCW_PROF_DATA_SEARCHDataTable() Me.Adapter.Fill(dataTable) Return dataTable End Function @@ -1169,7 +3761,7 @@ Namespace DBCW_StammdatenTableAdapters _ - Public Overloads Overridable Function Update(ByVal dataTable As DBCW_Stammdaten.TBCW_PROFILESDataTable) As Integer + Public Overloads Overridable Function Update(ByVal dataTable As DBCW_Stammdaten.TBCW_PROF_DATA_SEARCHDataTable) As Integer Return Me.Adapter.Update(dataTable) End Function @@ -1177,7 +3769,7 @@ Namespace DBCW_StammdatenTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")> _ Public Overloads Overridable Function Update(ByVal dataSet As DBCW_Stammdaten) As Integer - Return Me.Adapter.Update(dataSet, "TBCW_PROFILES") + Return Me.Adapter.Update(dataSet, "TBCW_PROF_DATA_SEARCH") End Function _ - Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer, ByVal Original_NAME As String, ByVal Original_COMMENT As String, ByVal Original_REGEX_EXPRESSION As String, ByVal Original_ADDED_WHO As String, ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), ByVal Original_CHANGED_WHO As String, ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date), ByVal Original_ACTIVE As Boolean, ByVal Original_PROFILE_TYPE As Short) As Integer + Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer, ByVal Original_PROFILE_ID As Integer, ByVal Original_CONN_ID As Byte, ByVal Original_TAB_INDEX As Byte, ByVal Original_ACTIVE As Boolean, ByVal Original_TAB_TITLE As String, ByVal Original_ADDED_WHO As String, ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), ByVal Original_CHANGED_WHO As String, ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date)) As Integer Me.Adapter.DeleteCommand.Parameters(0).Value = CType(Original_GUID,Integer) - If (Original_NAME Is Nothing) Then - Throw New Global.System.ArgumentNullException("Original_NAME") - Else - Me.Adapter.DeleteCommand.Parameters(1).Value = CType(Original_NAME,String) - End If - If (Original_COMMENT Is Nothing) Then - Me.Adapter.DeleteCommand.Parameters(2).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(3).Value = Global.System.DBNull.Value - Else - Me.Adapter.DeleteCommand.Parameters(2).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(3).Value = CType(Original_COMMENT,String) - End If - If (Original_REGEX_EXPRESSION Is Nothing) Then - Throw New Global.System.ArgumentNullException("Original_REGEX_EXPRESSION") + Me.Adapter.DeleteCommand.Parameters(1).Value = CType(Original_PROFILE_ID,Integer) + Me.Adapter.DeleteCommand.Parameters(2).Value = CType(Original_CONN_ID,Byte) + Me.Adapter.DeleteCommand.Parameters(3).Value = CType(Original_TAB_INDEX,Byte) + Me.Adapter.DeleteCommand.Parameters(4).Value = CType(Original_ACTIVE,Boolean) + If (Original_TAB_TITLE Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_TAB_TITLE") Else - Me.Adapter.DeleteCommand.Parameters(4).Value = CType(Original_REGEX_EXPRESSION,String) + Me.Adapter.DeleteCommand.Parameters(5).Value = CType(Original_TAB_TITLE,String) End If If (Original_ADDED_WHO Is Nothing) Then Throw New Global.System.ArgumentNullException("Original_ADDED_WHO") Else - Me.Adapter.DeleteCommand.Parameters(5).Value = CType(Original_ADDED_WHO,String) + Me.Adapter.DeleteCommand.Parameters(6).Value = CType(Original_ADDED_WHO,String) End If If (Original_ADDED_WHEN.HasValue = true) Then - Me.Adapter.DeleteCommand.Parameters(6).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(7).Value = CType(Original_ADDED_WHEN.Value,Date) + Me.Adapter.DeleteCommand.Parameters(7).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(8).Value = CType(Original_ADDED_WHEN.Value,Date) Else - Me.Adapter.DeleteCommand.Parameters(6).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(7).Value = Global.System.DBNull.Value + Me.Adapter.DeleteCommand.Parameters(7).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(8).Value = Global.System.DBNull.Value End If If (Original_CHANGED_WHO Is Nothing) Then - Me.Adapter.DeleteCommand.Parameters(8).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(9).Value = Global.System.DBNull.Value + Me.Adapter.DeleteCommand.Parameters(9).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(10).Value = Global.System.DBNull.Value Else - Me.Adapter.DeleteCommand.Parameters(8).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(9).Value = CType(Original_CHANGED_WHO,String) + Me.Adapter.DeleteCommand.Parameters(9).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(10).Value = CType(Original_CHANGED_WHO,String) End If If (Original_CHANGED_WHEN.HasValue = true) Then - Me.Adapter.DeleteCommand.Parameters(10).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(11).Value = CType(Original_CHANGED_WHEN.Value,Date) + Me.Adapter.DeleteCommand.Parameters(11).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(12).Value = CType(Original_CHANGED_WHEN.Value,Date) Else - Me.Adapter.DeleteCommand.Parameters(10).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(11).Value = Global.System.DBNull.Value + Me.Adapter.DeleteCommand.Parameters(11).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(12).Value = Global.System.DBNull.Value End If - Me.Adapter.DeleteCommand.Parameters(12).Value = CType(Original_ACTIVE,Boolean) - Me.Adapter.DeleteCommand.Parameters(13).Value = CType(Original_PROFILE_TYPE,Short) Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.DeleteCommand.Connection.State If ((Me.Adapter.DeleteCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then @@ -1264,44 +3846,46 @@ Namespace DBCW_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 NAME As String, ByVal COMMENT As String, ByVal REGEX_EXPRESSION 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 ACTIVE As Boolean, ByVal PROFILE_TYPE As Short) As Integer - If (NAME Is Nothing) Then - Throw New Global.System.ArgumentNullException("NAME") - Else - Me.Adapter.InsertCommand.Parameters(0).Value = CType(NAME,String) - End If - If (COMMENT Is Nothing) Then - Me.Adapter.InsertCommand.Parameters(1).Value = Global.System.DBNull.Value + Public Overloads Overridable Function Insert(ByVal PROFILE_ID As Integer, ByVal CONN_ID As Byte, ByVal SQL_COMMAND As String, ByVal TAB_INDEX As Byte, ByVal ACTIVE As Boolean, ByVal TAB_TITLE 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 COUNT_COMMAND As String) As Integer + Me.Adapter.InsertCommand.Parameters(0).Value = CType(PROFILE_ID,Integer) + Me.Adapter.InsertCommand.Parameters(1).Value = CType(CONN_ID,Byte) + If (SQL_COMMAND Is Nothing) Then + Throw New Global.System.ArgumentNullException("SQL_COMMAND") Else - Me.Adapter.InsertCommand.Parameters(1).Value = CType(COMMENT,String) + Me.Adapter.InsertCommand.Parameters(2).Value = CType(SQL_COMMAND,String) End If - If (REGEX_EXPRESSION Is Nothing) Then - Throw New Global.System.ArgumentNullException("REGEX_EXPRESSION") + Me.Adapter.InsertCommand.Parameters(3).Value = CType(TAB_INDEX,Byte) + Me.Adapter.InsertCommand.Parameters(4).Value = CType(ACTIVE,Boolean) + If (TAB_TITLE Is Nothing) Then + Throw New Global.System.ArgumentNullException("TAB_TITLE") Else - Me.Adapter.InsertCommand.Parameters(2).Value = CType(REGEX_EXPRESSION,String) + Me.Adapter.InsertCommand.Parameters(5).Value = CType(TAB_TITLE,String) End If If (ADDED_WHO Is Nothing) Then Throw New Global.System.ArgumentNullException("ADDED_WHO") Else - Me.Adapter.InsertCommand.Parameters(3).Value = CType(ADDED_WHO,String) + Me.Adapter.InsertCommand.Parameters(6).Value = CType(ADDED_WHO,String) End If If (ADDED_WHEN.HasValue = true) Then - Me.Adapter.InsertCommand.Parameters(4).Value = CType(ADDED_WHEN.Value,Date) + Me.Adapter.InsertCommand.Parameters(7).Value = CType(ADDED_WHEN.Value,Date) Else - Me.Adapter.InsertCommand.Parameters(4).Value = Global.System.DBNull.Value + Me.Adapter.InsertCommand.Parameters(7).Value = Global.System.DBNull.Value End If If (CHANGED_WHO Is Nothing) Then - Me.Adapter.InsertCommand.Parameters(5).Value = Global.System.DBNull.Value + Me.Adapter.InsertCommand.Parameters(8).Value = Global.System.DBNull.Value Else - Me.Adapter.InsertCommand.Parameters(5).Value = CType(CHANGED_WHO,String) + Me.Adapter.InsertCommand.Parameters(8).Value = CType(CHANGED_WHO,String) End If If (CHANGED_WHEN.HasValue = true) Then - Me.Adapter.InsertCommand.Parameters(6).Value = CType(CHANGED_WHEN.Value,Date) + Me.Adapter.InsertCommand.Parameters(9).Value = CType(CHANGED_WHEN.Value,Date) Else - Me.Adapter.InsertCommand.Parameters(6).Value = Global.System.DBNull.Value + Me.Adapter.InsertCommand.Parameters(9).Value = Global.System.DBNull.Value + End If + If (COUNT_COMMAND Is Nothing) Then + Throw New Global.System.ArgumentNullException("COUNT_COMMAND") + Else + Me.Adapter.InsertCommand.Parameters(10).Value = CType(COUNT_COMMAND,String) End If - Me.Adapter.InsertCommand.Parameters(7).Value = CType(ACTIVE,Boolean) - Me.Adapter.InsertCommand.Parameters(8).Value = CType(PROFILE_TYPE,Short) Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then @@ -1322,110 +3906,104 @@ Namespace DBCW_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 NAME As String, _ - ByVal COMMENT As String, _ - ByVal REGEX_EXPRESSION As String, _ + ByVal PROFILE_ID As Integer, _ + ByVal CONN_ID As Byte, _ + ByVal SQL_COMMAND As String, _ + ByVal TAB_INDEX As Byte, _ + ByVal ACTIVE As Boolean, _ + ByVal TAB_TITLE 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 ACTIVE As Boolean, _ - ByVal PROFILE_TYPE As Short, _ + ByVal COUNT_COMMAND As String, _ ByVal Original_GUID As Integer, _ - ByVal Original_NAME As String, _ - ByVal Original_COMMENT As String, _ - ByVal Original_REGEX_EXPRESSION As String, _ + ByVal Original_PROFILE_ID As Integer, _ + ByVal Original_CONN_ID As Byte, _ + ByVal Original_TAB_INDEX As Byte, _ + ByVal Original_ACTIVE As Boolean, _ + ByVal Original_TAB_TITLE As String, _ ByVal Original_ADDED_WHO As String, _ ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), _ ByVal Original_CHANGED_WHO As String, _ ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date), _ - ByVal Original_ACTIVE As Boolean, _ - ByVal Original_PROFILE_TYPE As Short, _ ByVal GUID As Integer) As Integer - If (NAME Is Nothing) Then - Throw New Global.System.ArgumentNullException("NAME") + Me.Adapter.UpdateCommand.Parameters(0).Value = CType(PROFILE_ID,Integer) + Me.Adapter.UpdateCommand.Parameters(1).Value = CType(CONN_ID,Byte) + If (SQL_COMMAND Is Nothing) Then + Throw New Global.System.ArgumentNullException("SQL_COMMAND") Else - Me.Adapter.UpdateCommand.Parameters(0).Value = CType(NAME,String) - End If - If (COMMENT Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(1).Value = Global.System.DBNull.Value - Else - Me.Adapter.UpdateCommand.Parameters(1).Value = CType(COMMENT,String) + Me.Adapter.UpdateCommand.Parameters(2).Value = CType(SQL_COMMAND,String) End If - If (REGEX_EXPRESSION Is Nothing) Then - Throw New Global.System.ArgumentNullException("REGEX_EXPRESSION") + Me.Adapter.UpdateCommand.Parameters(3).Value = CType(TAB_INDEX,Byte) + Me.Adapter.UpdateCommand.Parameters(4).Value = CType(ACTIVE,Boolean) + If (TAB_TITLE Is Nothing) Then + Throw New Global.System.ArgumentNullException("TAB_TITLE") Else - Me.Adapter.UpdateCommand.Parameters(2).Value = CType(REGEX_EXPRESSION,String) + Me.Adapter.UpdateCommand.Parameters(5).Value = CType(TAB_TITLE,String) End If If (ADDED_WHO Is Nothing) Then Throw New Global.System.ArgumentNullException("ADDED_WHO") Else - Me.Adapter.UpdateCommand.Parameters(3).Value = CType(ADDED_WHO,String) + Me.Adapter.UpdateCommand.Parameters(6).Value = CType(ADDED_WHO,String) End If If (ADDED_WHEN.HasValue = true) Then - Me.Adapter.UpdateCommand.Parameters(4).Value = CType(ADDED_WHEN.Value,Date) + Me.Adapter.UpdateCommand.Parameters(7).Value = CType(ADDED_WHEN.Value,Date) Else - Me.Adapter.UpdateCommand.Parameters(4).Value = Global.System.DBNull.Value + Me.Adapter.UpdateCommand.Parameters(7).Value = Global.System.DBNull.Value End If If (CHANGED_WHO Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(5).Value = Global.System.DBNull.Value + Me.Adapter.UpdateCommand.Parameters(8).Value = Global.System.DBNull.Value Else - Me.Adapter.UpdateCommand.Parameters(5).Value = CType(CHANGED_WHO,String) + Me.Adapter.UpdateCommand.Parameters(8).Value = CType(CHANGED_WHO,String) End If If (CHANGED_WHEN.HasValue = true) Then - Me.Adapter.UpdateCommand.Parameters(6).Value = CType(CHANGED_WHEN.Value,Date) - Else - Me.Adapter.UpdateCommand.Parameters(6).Value = Global.System.DBNull.Value - End If - Me.Adapter.UpdateCommand.Parameters(7).Value = CType(ACTIVE,Boolean) - Me.Adapter.UpdateCommand.Parameters(8).Value = CType(PROFILE_TYPE,Short) - Me.Adapter.UpdateCommand.Parameters(9).Value = CType(Original_GUID,Integer) - If (Original_NAME Is Nothing) Then - Throw New Global.System.ArgumentNullException("Original_NAME") + Me.Adapter.UpdateCommand.Parameters(9).Value = CType(CHANGED_WHEN.Value,Date) Else - Me.Adapter.UpdateCommand.Parameters(10).Value = CType(Original_NAME,String) + Me.Adapter.UpdateCommand.Parameters(9).Value = Global.System.DBNull.Value End If - If (Original_COMMENT Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(11).Value = CType(1,Object) - Me.Adapter.UpdateCommand.Parameters(12).Value = Global.System.DBNull.Value + If (COUNT_COMMAND Is Nothing) Then + Throw New Global.System.ArgumentNullException("COUNT_COMMAND") Else - Me.Adapter.UpdateCommand.Parameters(11).Value = CType(0,Object) - Me.Adapter.UpdateCommand.Parameters(12).Value = CType(Original_COMMENT,String) + Me.Adapter.UpdateCommand.Parameters(10).Value = CType(COUNT_COMMAND,String) End If - If (Original_REGEX_EXPRESSION Is Nothing) Then - Throw New Global.System.ArgumentNullException("Original_REGEX_EXPRESSION") + Me.Adapter.UpdateCommand.Parameters(11).Value = CType(Original_GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(12).Value = CType(Original_PROFILE_ID,Integer) + Me.Adapter.UpdateCommand.Parameters(13).Value = CType(Original_CONN_ID,Byte) + Me.Adapter.UpdateCommand.Parameters(14).Value = CType(Original_TAB_INDEX,Byte) + Me.Adapter.UpdateCommand.Parameters(15).Value = CType(Original_ACTIVE,Boolean) + If (Original_TAB_TITLE Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_TAB_TITLE") Else - Me.Adapter.UpdateCommand.Parameters(13).Value = CType(Original_REGEX_EXPRESSION,String) + Me.Adapter.UpdateCommand.Parameters(16).Value = CType(Original_TAB_TITLE,String) End If If (Original_ADDED_WHO Is Nothing) Then Throw New Global.System.ArgumentNullException("Original_ADDED_WHO") Else - Me.Adapter.UpdateCommand.Parameters(14).Value = CType(Original_ADDED_WHO,String) + Me.Adapter.UpdateCommand.Parameters(17).Value = CType(Original_ADDED_WHO,String) End If If (Original_ADDED_WHEN.HasValue = true) Then - Me.Adapter.UpdateCommand.Parameters(15).Value = CType(0,Object) - Me.Adapter.UpdateCommand.Parameters(16).Value = CType(Original_ADDED_WHEN.Value,Date) + Me.Adapter.UpdateCommand.Parameters(18).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(19).Value = CType(Original_ADDED_WHEN.Value,Date) Else - Me.Adapter.UpdateCommand.Parameters(15).Value = CType(1,Object) - Me.Adapter.UpdateCommand.Parameters(16).Value = Global.System.DBNull.Value + Me.Adapter.UpdateCommand.Parameters(18).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(19).Value = Global.System.DBNull.Value End If If (Original_CHANGED_WHO Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(17).Value = CType(1,Object) - Me.Adapter.UpdateCommand.Parameters(18).Value = Global.System.DBNull.Value + Me.Adapter.UpdateCommand.Parameters(20).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(21).Value = Global.System.DBNull.Value Else - Me.Adapter.UpdateCommand.Parameters(17).Value = CType(0,Object) - Me.Adapter.UpdateCommand.Parameters(18).Value = CType(Original_CHANGED_WHO,String) + Me.Adapter.UpdateCommand.Parameters(20).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(21).Value = CType(Original_CHANGED_WHO,String) End If If (Original_CHANGED_WHEN.HasValue = true) Then - Me.Adapter.UpdateCommand.Parameters(19).Value = CType(0,Object) - Me.Adapter.UpdateCommand.Parameters(20).Value = CType(Original_CHANGED_WHEN.Value,Date) + Me.Adapter.UpdateCommand.Parameters(22).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(23).Value = CType(Original_CHANGED_WHEN.Value,Date) Else - Me.Adapter.UpdateCommand.Parameters(19).Value = CType(1,Object) - Me.Adapter.UpdateCommand.Parameters(20).Value = Global.System.DBNull.Value + Me.Adapter.UpdateCommand.Parameters(22).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(23).Value = Global.System.DBNull.Value End If - Me.Adapter.UpdateCommand.Parameters(21).Value = CType(Original_ACTIVE,Boolean) - Me.Adapter.UpdateCommand.Parameters(22).Value = CType(Original_PROFILE_TYPE,Short) - Me.Adapter.UpdateCommand.Parameters(23).Value = CType(GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(24).Value = CType(GUID,Integer) Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then @@ -1446,26 +4024,28 @@ Namespace DBCW_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 NAME As String, _ - ByVal COMMENT As String, _ - ByVal REGEX_EXPRESSION As String, _ + ByVal PROFILE_ID As Integer, _ + ByVal CONN_ID As Byte, _ + ByVal SQL_COMMAND As String, _ + ByVal TAB_INDEX As Byte, _ + ByVal ACTIVE As Boolean, _ + ByVal TAB_TITLE 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 ACTIVE As Boolean, _ - ByVal PROFILE_TYPE As Short, _ + ByVal COUNT_COMMAND As String, _ ByVal Original_GUID As Integer, _ - ByVal Original_NAME As String, _ - ByVal Original_COMMENT As String, _ - ByVal Original_REGEX_EXPRESSION As String, _ + ByVal Original_PROFILE_ID As Integer, _ + ByVal Original_CONN_ID As Byte, _ + ByVal Original_TAB_INDEX As Byte, _ + ByVal Original_ACTIVE As Boolean, _ + ByVal Original_TAB_TITLE As String, _ ByVal Original_ADDED_WHO As String, _ ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), _ ByVal Original_CHANGED_WHO As String, _ - ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date), _ - ByVal Original_ACTIVE As Boolean, _ - ByVal Original_PROFILE_TYPE As Short) As Integer - Return Me.Update(NAME, COMMENT, REGEX_EXPRESSION, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, ACTIVE, PROFILE_TYPE, Original_GUID, Original_NAME, Original_COMMENT, Original_REGEX_EXPRESSION, Original_ADDED_WHO, Original_ADDED_WHEN, Original_CHANGED_WHO, Original_CHANGED_WHEN, Original_ACTIVE, Original_PROFILE_TYPE, Original_GUID) + ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date)) As Integer + Return Me.Update(PROFILE_ID, CONN_ID, SQL_COMMAND, TAB_INDEX, ACTIVE, TAB_TITLE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COUNT_COMMAND, Original_GUID, Original_PROFILE_ID, Original_CONN_ID, Original_TAB_INDEX, Original_ACTIVE, Original_TAB_TITLE, Original_ADDED_WHO, Original_ADDED_WHEN, Original_CHANGED_WHO, Original_CHANGED_WHEN, Original_GUID) End Function End Class @@ -1484,6 +4064,10 @@ Namespace DBCW_StammdatenTableAdapters Private _tBCW_PROFILESTableAdapter As TBCW_PROFILESTableAdapter + Private _tBCW_PROF_DOC_SEARCHTableAdapter As TBCW_PROF_DOC_SEARCHTableAdapter + + Private _tBCW_PROF_DATA_SEARCHTableAdapter As TBCW_PROF_DATA_SEARCHTableAdapter + Private _backupDataSetBeforeUpdate As Boolean Private _connection As Global.System.Data.IDbConnection @@ -1513,6 +4097,34 @@ Namespace DBCW_StammdatenTableAdapters End Set End Property + _ + Public Property TBCW_PROF_DOC_SEARCHTableAdapter() As TBCW_PROF_DOC_SEARCHTableAdapter + Get + Return Me._tBCW_PROF_DOC_SEARCHTableAdapter + End Get + Set + Me._tBCW_PROF_DOC_SEARCHTableAdapter = value + End Set + End Property + + _ + Public Property TBCW_PROF_DATA_SEARCHTableAdapter() As TBCW_PROF_DATA_SEARCHTableAdapter + Get + Return Me._tBCW_PROF_DATA_SEARCHTableAdapter + End Get + Set + Me._tBCW_PROF_DATA_SEARCHTableAdapter = value + End Set + End Property + _ Public Property BackupDataSetBeforeUpdate() As Boolean @@ -1536,6 +4148,14 @@ Namespace DBCW_StammdatenTableAdapters AndAlso (Not (Me._tBCW_PROFILESTableAdapter.Connection) Is Nothing)) Then Return Me._tBCW_PROFILESTableAdapter.Connection End If + If ((Not (Me._tBCW_PROF_DOC_SEARCHTableAdapter) Is Nothing) _ + AndAlso (Not (Me._tBCW_PROF_DOC_SEARCHTableAdapter.Connection) Is Nothing)) Then + Return Me._tBCW_PROF_DOC_SEARCHTableAdapter.Connection + End If + If ((Not (Me._tBCW_PROF_DATA_SEARCHTableAdapter) Is Nothing) _ + AndAlso (Not (Me._tBCW_PROF_DATA_SEARCHTableAdapter.Connection) Is Nothing)) Then + Return Me._tBCW_PROF_DATA_SEARCHTableAdapter.Connection + End If Return Nothing End Get Set @@ -1552,6 +4172,12 @@ Namespace DBCW_StammdatenTableAdapters If (Not (Me._tBCW_PROFILESTableAdapter) Is Nothing) Then count = (count + 1) End If + If (Not (Me._tBCW_PROF_DOC_SEARCHTableAdapter) Is Nothing) Then + count = (count + 1) + End If + If (Not (Me._tBCW_PROF_DATA_SEARCHTableAdapter) Is Nothing) Then + count = (count + 1) + End If Return count End Get End Property @@ -1572,6 +4198,24 @@ Namespace DBCW_StammdatenTableAdapters allChangedRows.AddRange(updatedRows) End If End If + If (Not (Me._tBCW_PROF_DOC_SEARCHTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROF_DOC_SEARCH.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) + If ((Not (updatedRows) Is Nothing) _ + AndAlso (0 < updatedRows.Length)) Then + result = (result + Me._tBCW_PROF_DOC_SEARCHTableAdapter.Update(updatedRows)) + allChangedRows.AddRange(updatedRows) + End If + End If + If (Not (Me._tBCW_PROF_DATA_SEARCHTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROF_DATA_SEARCH.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) + If ((Not (updatedRows) Is Nothing) _ + AndAlso (0 < updatedRows.Length)) Then + result = (result + Me._tBCW_PROF_DATA_SEARCHTableAdapter.Update(updatedRows)) + allChangedRows.AddRange(updatedRows) + End If + End If Return result End Function @@ -1590,6 +4234,22 @@ Namespace DBCW_StammdatenTableAdapters allAddedRows.AddRange(addedRows) End If End If + If (Not (Me._tBCW_PROF_DOC_SEARCHTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROF_DOC_SEARCH.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If ((Not (addedRows) Is Nothing) _ + AndAlso (0 < addedRows.Length)) Then + result = (result + Me._tBCW_PROF_DOC_SEARCHTableAdapter.Update(addedRows)) + allAddedRows.AddRange(addedRows) + End If + End If + If (Not (Me._tBCW_PROF_DATA_SEARCHTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROF_DATA_SEARCH.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If ((Not (addedRows) Is Nothing) _ + AndAlso (0 < addedRows.Length)) Then + result = (result + Me._tBCW_PROF_DATA_SEARCHTableAdapter.Update(addedRows)) + allAddedRows.AddRange(addedRows) + End If + End If Return result End Function @@ -1600,6 +4260,22 @@ Namespace DBCW_StammdatenTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function UpdateDeletedRows(ByVal dataSet As DBCW_Stammdaten, ByVal allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 + If (Not (Me._tBCW_PROF_DATA_SEARCHTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROF_DATA_SEARCH.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If ((Not (deletedRows) Is Nothing) _ + AndAlso (0 < deletedRows.Length)) Then + result = (result + Me._tBCW_PROF_DATA_SEARCHTableAdapter.Update(deletedRows)) + allChangedRows.AddRange(deletedRows) + End If + End If + If (Not (Me._tBCW_PROF_DOC_SEARCHTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROF_DOC_SEARCH.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If ((Not (deletedRows) Is Nothing) _ + AndAlso (0 < deletedRows.Length)) Then + result = (result + Me._tBCW_PROF_DOC_SEARCHTableAdapter.Update(deletedRows)) + allChangedRows.AddRange(deletedRows) + End If + End If If (Not (Me._tBCW_PROFILESTableAdapter) Is Nothing) Then Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROFILES.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ @@ -1654,6 +4330,16 @@ Namespace DBCW_StammdatenTableAdapters Throw New Global.System.ArgumentException("Für alle von einem TableAdapterManager verwalteten Instanzen von TableAdapter mus"& _ "s die gleiche Verbindungszeichenfolge verwendet werden.") End If + If ((Not (Me._tBCW_PROF_DOC_SEARCHTableAdapter) Is Nothing) _ + AndAlso (Me.MatchTableAdapterConnection(Me._tBCW_PROF_DOC_SEARCHTableAdapter.Connection) = false)) Then + Throw New Global.System.ArgumentException("Für alle von einem TableAdapterManager verwalteten Instanzen von TableAdapter mus"& _ + "s die gleiche Verbindungszeichenfolge verwendet werden.") + End If + If ((Not (Me._tBCW_PROF_DATA_SEARCHTableAdapter) Is Nothing) _ + AndAlso (Me.MatchTableAdapterConnection(Me._tBCW_PROF_DATA_SEARCHTableAdapter.Connection) = false)) Then + Throw New Global.System.ArgumentException("Für alle von einem TableAdapterManager verwalteten Instanzen von TableAdapter mus"& _ + "s die gleiche Verbindungszeichenfolge verwendet werden.") + End If Dim workConnection As Global.System.Data.IDbConnection = Me.Connection If (workConnection Is Nothing) Then Throw New Global.System.ApplicationException("TableAdapterManager enthält keine Verbindungsinformationen. Legen Sie jede TableA"& _ @@ -1697,6 +4383,24 @@ Namespace DBCW_StammdatenTableAdapters adaptersWithAcceptChangesDuringUpdate.Add(Me._tBCW_PROFILESTableAdapter.Adapter) End If End If + If (Not (Me._tBCW_PROF_DOC_SEARCHTableAdapter) Is Nothing) Then + revertConnections.Add(Me._tBCW_PROF_DOC_SEARCHTableAdapter, Me._tBCW_PROF_DOC_SEARCHTableAdapter.Connection) + Me._tBCW_PROF_DOC_SEARCHTableAdapter.Connection = CType(workConnection,Global.System.Data.SqlClient.SqlConnection) + Me._tBCW_PROF_DOC_SEARCHTableAdapter.Transaction = CType(workTransaction,Global.System.Data.SqlClient.SqlTransaction) + If Me._tBCW_PROF_DOC_SEARCHTableAdapter.Adapter.AcceptChangesDuringUpdate Then + Me._tBCW_PROF_DOC_SEARCHTableAdapter.Adapter.AcceptChangesDuringUpdate = false + adaptersWithAcceptChangesDuringUpdate.Add(Me._tBCW_PROF_DOC_SEARCHTableAdapter.Adapter) + End If + End If + If (Not (Me._tBCW_PROF_DATA_SEARCHTableAdapter) Is Nothing) Then + revertConnections.Add(Me._tBCW_PROF_DATA_SEARCHTableAdapter, Me._tBCW_PROF_DATA_SEARCHTableAdapter.Connection) + Me._tBCW_PROF_DATA_SEARCHTableAdapter.Connection = CType(workConnection,Global.System.Data.SqlClient.SqlConnection) + Me._tBCW_PROF_DATA_SEARCHTableAdapter.Transaction = CType(workTransaction,Global.System.Data.SqlClient.SqlTransaction) + If Me._tBCW_PROF_DATA_SEARCHTableAdapter.Adapter.AcceptChangesDuringUpdate Then + Me._tBCW_PROF_DATA_SEARCHTableAdapter.Adapter.AcceptChangesDuringUpdate = false + adaptersWithAcceptChangesDuringUpdate.Add(Me._tBCW_PROF_DATA_SEARCHTableAdapter.Adapter) + End If + End If ' '---- Perform updates ----------- ' @@ -1761,6 +4465,14 @@ Namespace DBCW_StammdatenTableAdapters Me._tBCW_PROFILESTableAdapter.Connection = CType(revertConnections(Me._tBCW_PROFILESTableAdapter),Global.System.Data.SqlClient.SqlConnection) Me._tBCW_PROFILESTableAdapter.Transaction = Nothing End If + If (Not (Me._tBCW_PROF_DOC_SEARCHTableAdapter) Is Nothing) Then + Me._tBCW_PROF_DOC_SEARCHTableAdapter.Connection = CType(revertConnections(Me._tBCW_PROF_DOC_SEARCHTableAdapter),Global.System.Data.SqlClient.SqlConnection) + Me._tBCW_PROF_DOC_SEARCHTableAdapter.Transaction = Nothing + End If + If (Not (Me._tBCW_PROF_DATA_SEARCHTableAdapter) Is Nothing) Then + Me._tBCW_PROF_DATA_SEARCHTableAdapter.Connection = CType(revertConnections(Me._tBCW_PROF_DATA_SEARCHTableAdapter),Global.System.Data.SqlClient.SqlConnection) + Me._tBCW_PROF_DATA_SEARCHTableAdapter.Transaction = Nothing + End If If (0 < adaptersWithAcceptChangesDuringUpdate.Count) Then Dim adapters((adaptersWithAcceptChangesDuringUpdate.Count) - 1) As Global.System.Data.Common.DataAdapter adaptersWithAcceptChangesDuringUpdate.CopyTo(adapters) diff --git a/GUIs.ZooFlow/DBCW_Stammdaten.xsd b/GUIs.ZooFlow/DBCW_Stammdaten.xsd index 0ba73aac..082e8626 100644 --- a/GUIs.ZooFlow/DBCW_Stammdaten.xsd +++ b/GUIs.ZooFlow/DBCW_Stammdaten.xsd @@ -104,6 +104,211 @@ SELECT GUID, NAME, COMMENT, REGEX_EXPRESSION, ADDED_WHO, ADDED_WHEN, CHANGED_WHO + + + + + + DELETE FROM [TBCW_PROF_DOC_SEARCH] WHERE (([GUID] = @Original_GUID) AND ([PROFILE_ID] = @Original_PROFILE_ID) AND ([CONN_ID] = @Original_CONN_ID) AND ([TAB_INDEX] = @Original_TAB_INDEX) AND ([ACTIVE] = @Original_ACTIVE) AND ([TAB_TITLE] = @Original_TAB_TITLE) AND ([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))) + + + + + + + + + + + + + + + + + + + + INSERT INTO [TBCW_PROF_DOC_SEARCH] ([PROFILE_ID], [CONN_ID], [SQL_COMMAND], [TAB_INDEX], [ACTIVE], [TAB_TITLE], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN], [COUNT_COMMAND]) VALUES (@PROFILE_ID, @CONN_ID, @SQL_COMMAND, @TAB_INDEX, @ACTIVE, @TAB_TITLE, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN, @COUNT_COMMAND); +SELECT GUID, PROFILE_ID, CONN_ID, SQL_COMMAND, TAB_INDEX, ACTIVE, TAB_TITLE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COUNT_COMMAND FROM TBCW_PROF_DOC_SEARCH WHERE (GUID = SCOPE_IDENTITY()) + + + + + + + + + + + + + + + + + + SELECT TBCW_PROF_DOC_SEARCH.* +FROM TBCW_PROF_DOC_SEARCH WHERE PROFILE_ID = @PROFILE_ID + + + + + + + + UPDATE [TBCW_PROF_DOC_SEARCH] SET [PROFILE_ID] = @PROFILE_ID, [CONN_ID] = @CONN_ID, [SQL_COMMAND] = @SQL_COMMAND, [TAB_INDEX] = @TAB_INDEX, [ACTIVE] = @ACTIVE, [TAB_TITLE] = @TAB_TITLE, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN, [COUNT_COMMAND] = @COUNT_COMMAND WHERE (([GUID] = @Original_GUID) AND ([PROFILE_ID] = @Original_PROFILE_ID) AND ([CONN_ID] = @Original_CONN_ID) AND ([TAB_INDEX] = @Original_TAB_INDEX) AND ([ACTIVE] = @Original_ACTIVE) AND ([TAB_TITLE] = @Original_TAB_TITLE) AND ([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))); +SELECT GUID, PROFILE_ID, CONN_ID, SQL_COMMAND, TAB_INDEX, ACTIVE, TAB_TITLE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COUNT_COMMAND FROM TBCW_PROF_DOC_SEARCH WHERE (GUID = @GUID) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DELETE FROM [TBCW_PROF_DATA_SEARCH] WHERE (([GUID] = @Original_GUID) AND ([PROFILE_ID] = @Original_PROFILE_ID) AND ([CONN_ID] = @Original_CONN_ID) AND ([TAB_INDEX] = @Original_TAB_INDEX) AND ([ACTIVE] = @Original_ACTIVE) AND ([TAB_TITLE] = @Original_TAB_TITLE) AND ([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))) + + + + + + + + + + + + + + + + + + + + INSERT INTO [TBCW_PROF_DATA_SEARCH] ([PROFILE_ID], [CONN_ID], [SQL_COMMAND], [TAB_INDEX], [ACTIVE], [TAB_TITLE], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN], [COUNT_COMMAND]) VALUES (@PROFILE_ID, @CONN_ID, @SQL_COMMAND, @TAB_INDEX, @ACTIVE, @TAB_TITLE, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN, @COUNT_COMMAND); +SELECT GUID, PROFILE_ID, CONN_ID, SQL_COMMAND, TAB_INDEX, ACTIVE, TAB_TITLE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COUNT_COMMAND FROM TBCW_PROF_DATA_SEARCH WHERE (GUID = SCOPE_IDENTITY()) + + + + + + + + + + + + + + + + + + SELECT GUID, PROFILE_ID, CONN_ID, SQL_COMMAND, TAB_INDEX, ACTIVE, TAB_TITLE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COUNT_COMMAND +FROM TBCW_PROF_DATA_SEARCH +WHERE (PROFILE_ID = @PROFILE_ID) + + + + + + + + UPDATE [TBCW_PROF_DATA_SEARCH] SET [PROFILE_ID] = @PROFILE_ID, [CONN_ID] = @CONN_ID, [SQL_COMMAND] = @SQL_COMMAND, [TAB_INDEX] = @TAB_INDEX, [ACTIVE] = @ACTIVE, [TAB_TITLE] = @TAB_TITLE, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN, [COUNT_COMMAND] = @COUNT_COMMAND WHERE (([GUID] = @Original_GUID) AND ([PROFILE_ID] = @Original_PROFILE_ID) AND ([CONN_ID] = @Original_CONN_ID) AND ([TAB_INDEX] = @Original_TAB_INDEX) AND ([ACTIVE] = @Original_ACTIVE) AND ([TAB_TITLE] = @Original_TAB_TITLE) AND ([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))); +SELECT GUID, PROFILE_ID, CONN_ID, SQL_COMMAND, TAB_INDEX, ACTIVE, TAB_TITLE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COUNT_COMMAND FROM TBCW_PROF_DATA_SEARCH WHERE (GUID = @GUID) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -112,7 +317,7 @@ SELECT GUID, NAME, COMMENT, REGEX_EXPRESSION, ADDED_WHO, ADDED_WHEN, CHANGED_WHO - + @@ -158,11 +363,121 @@ SELECT GUID, NAME, COMMENT, REGEX_EXPRESSION, ADDED_WHO, ADDED_WHEN, CHANGED_WHO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/DBCW_Stammdaten.xss b/GUIs.ZooFlow/DBCW_Stammdaten.xss index de0158bf..aa57a081 100644 --- a/GUIs.ZooFlow/DBCW_Stammdaten.xss +++ b/GUIs.ZooFlow/DBCW_Stammdaten.xss @@ -6,7 +6,34 @@ --> - + + + - + + + + + 285 + 79 + + + 664 + 79 + + + + + + + 285 + 262 + + + 673 + 262 + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Globix/frmGlobixAdministration.Designer.vb b/GUIs.ZooFlow/Globix/frmGlobixAdministration.Designer.vb index 5d7a2493..1e335728 100644 --- a/GUIs.ZooFlow/Globix/frmGlobixAdministration.Designer.vb +++ b/GUIs.ZooFlow/Globix/frmGlobixAdministration.Designer.vb @@ -108,7 +108,6 @@ Partial Class frmGlobixAdministration Me.LayoutControlItem18 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem12 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem13 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem10 = New DevExpress.XtraLayout.LayoutControlItem() Me.EmptySpaceItem1 = New DevExpress.XtraLayout.EmptySpaceItem() Me.LayoutControlItem16 = New DevExpress.XtraLayout.LayoutControlItem() Me.EmptySpaceItem2 = New DevExpress.XtraLayout.EmptySpaceItem() @@ -127,6 +126,7 @@ Partial Class frmGlobixAdministration Me.LayoutControlItem30 = New DevExpress.XtraLayout.LayoutControlItem() Me.EmptySpaceItem17 = New DevExpress.XtraLayout.EmptySpaceItem() Me.EmptySpaceItem18 = New DevExpress.XtraLayout.EmptySpaceItem() + Me.LayoutControlItem10 = New DevExpress.XtraLayout.LayoutControlItem() Me.ListBoxControlmanIndex = New DevExpress.XtraEditors.ListBoxControl() Me.XtraTabPageRework = New DevExpress.XtraTab.XtraTabPage() Me.XtraTabPageAutoIndexe = New DevExpress.XtraTab.XtraTabPage() @@ -206,7 +206,6 @@ Partial Class frmGlobixAdministration CType(Me.LayoutControlItem18, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem12, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem13, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem16, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.EmptySpaceItem2, System.ComponentModel.ISupportInitialize).BeginInit() @@ -225,6 +224,7 @@ Partial Class frmGlobixAdministration CType(Me.LayoutControlItem30, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.EmptySpaceItem17, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.EmptySpaceItem18, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ListBoxControlmanIndex, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabPageAutoIndexe.SuspendLayout() CType(Me.LayoutControlAutoIndexe, System.ComponentModel.ISupportInitialize).BeginInit() @@ -753,10 +753,10 @@ Partial Class frmGlobixAdministration Me.LayoutControl2.Controls.Add(Me.GUIDTextBox1) Me.LayoutControl2.Controls.Add(Me.ACTIVECheckBox) Me.LayoutControl2.Dock = System.Windows.Forms.DockStyle.Fill - Me.LayoutControl2.Location = New System.Drawing.Point(163, 0) + Me.LayoutControl2.Location = New System.Drawing.Point(165, 0) Me.LayoutControl2.Name = "LayoutControl2" Me.LayoutControl2.Root = Me.ControlGroupIndexeMan - Me.LayoutControl2.Size = New System.Drawing.Size(1019, 259) + Me.LayoutControl2.Size = New System.Drawing.Size(1017, 259) Me.LayoutControl2.TabIndex = 1 Me.LayoutControl2.Text = "LayoutControl2" ' @@ -764,15 +764,15 @@ Partial Class frmGlobixAdministration ' Me.ComboBox1.FormattingEnabled = True Me.ComboBox1.Items.AddRange(New Object() {"Dateiname (mit Endung)", "Dateiname (ohne Endung)", "Dateiendung", "Datei Erstelldatum", "Datei Erstellt wer", "Aktuelles Datum (DD.MM.YYYY)", "Username", "Usercode", "NULL"}) - Me.ComboBox1.Location = New System.Drawing.Point(546, 129) + Me.ComboBox1.Location = New System.Drawing.Point(545, 129) Me.ComboBox1.Name = "ComboBox1" - Me.ComboBox1.Size = New System.Drawing.Size(211, 21) + Me.ComboBox1.Size = New System.Drawing.Size(210, 21) Me.ComboBox1.TabIndex = 25 ' 'SimpleButton1 ' Me.SimpleButton1.ImageOptions.SvgImage = CType(resources.GetObject("SimpleButton1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.SimpleButton1.Location = New System.Drawing.Point(420, 129) + Me.SimpleButton1.Location = New System.Drawing.Point(419, 129) Me.SimpleButton1.Name = "SimpleButton1" Me.SimpleButton1.Size = New System.Drawing.Size(34, 22) Me.SimpleButton1.StyleController = Me.LayoutControl2 @@ -785,7 +785,7 @@ Partial Class frmGlobixAdministration Me.CHANGED_WHENTextBox.Location = New System.Drawing.Point(339, 227) Me.CHANGED_WHENTextBox.Name = "CHANGED_WHENTextBox" Me.CHANGED_WHENTextBox.ReadOnly = True - Me.CHANGED_WHENTextBox.Size = New System.Drawing.Size(181, 20) + Me.CHANGED_WHENTextBox.Size = New System.Drawing.Size(180, 20) Me.CHANGED_WHENTextBox.TabIndex = 22 ' 'TBDD_INDEX_MANBindingSource @@ -800,7 +800,7 @@ Partial Class frmGlobixAdministration Me.CHANGED_WHOTextBox.Location = New System.Drawing.Point(339, 203) Me.CHANGED_WHOTextBox.Name = "CHANGED_WHOTextBox" Me.CHANGED_WHOTextBox.ReadOnly = True - Me.CHANGED_WHOTextBox.Size = New System.Drawing.Size(181, 20) + Me.CHANGED_WHOTextBox.Size = New System.Drawing.Size(180, 20) Me.CHANGED_WHOTextBox.TabIndex = 21 ' 'ADDED_WHENTextBox @@ -826,7 +826,7 @@ Partial Class frmGlobixAdministration 'VKT_PREVENT_MULTIPLE_VALUESCheckBox ' Me.VKT_PREVENT_MULTIPLE_VALUESCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBDD_INDEX_MANBindingSource, "VKT_PREVENT_MULTIPLE_VALUES", True)) - Me.VKT_PREVENT_MULTIPLE_VALUESCheckBox.Location = New System.Drawing.Point(261, 179) + Me.VKT_PREVENT_MULTIPLE_VALUESCheckBox.Location = New System.Drawing.Point(260, 179) Me.VKT_PREVENT_MULTIPLE_VALUESCheckBox.Name = "VKT_PREVENT_MULTIPLE_VALUESCheckBox" Me.VKT_PREVENT_MULTIPLE_VALUESCheckBox.Size = New System.Drawing.Size(246, 20) Me.VKT_PREVENT_MULTIPLE_VALUESCheckBox.TabIndex = 18 @@ -838,7 +838,7 @@ Partial Class frmGlobixAdministration Me.MULTISELECTCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBDD_INDEX_MANBindingSource, "MULTISELECT", True)) Me.MULTISELECTCheckBox.Location = New System.Drawing.Point(12, 179) Me.MULTISELECTCheckBox.Name = "MULTISELECTCheckBox" - Me.MULTISELECTCheckBox.Size = New System.Drawing.Size(245, 20) + Me.MULTISELECTCheckBox.Size = New System.Drawing.Size(244, 20) Me.MULTISELECTCheckBox.TabIndex = 17 Me.MULTISELECTCheckBox.Text = "Mehrfachauswahl" Me.MULTISELECTCheckBox.UseVisualStyleBackColor = True @@ -846,9 +846,9 @@ Partial Class frmGlobixAdministration 'Button1 ' Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button1.Location = New System.Drawing.Point(559, 60) + Me.Button1.Location = New System.Drawing.Point(558, 60) Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(266, 21) + Me.Button1.Size = New System.Drawing.Size(265, 21) Me.Button1.TabIndex = 16 Me.Button1.Text = "Connector bearbeiten" Me.Button1.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -857,9 +857,9 @@ Partial Class frmGlobixAdministration 'VKT_ADD_ITEMCheckBox ' Me.VKT_ADD_ITEMCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBDD_INDEX_MANBindingSource, "VKT_ADD_ITEM", True)) - Me.VKT_ADD_ITEMCheckBox.Location = New System.Drawing.Point(511, 179) + Me.VKT_ADD_ITEMCheckBox.Location = New System.Drawing.Point(510, 179) Me.VKT_ADD_ITEMCheckBox.Name = "VKT_ADD_ITEMCheckBox" - Me.VKT_ADD_ITEMCheckBox.Size = New System.Drawing.Size(246, 20) + Me.VKT_ADD_ITEMCheckBox.Size = New System.Drawing.Size(245, 20) Me.VKT_ADD_ITEMCheckBox.TabIndex = 15 Me.VKT_ADD_ITEMCheckBox.Text = "Neueingabe erlauben" Me.VKT_ADD_ITEMCheckBox.UseVisualStyleBackColor = True @@ -869,14 +869,14 @@ Partial Class frmGlobixAdministration Me.DEFAULT_VALUETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "DEFAULT_VALUE", True)) Me.DEFAULT_VALUETextBox.Location = New System.Drawing.Point(100, 129) Me.DEFAULT_VALUETextBox.Name = "DEFAULT_VALUETextBox" - Me.DEFAULT_VALUETextBox.Size = New System.Drawing.Size(316, 20) + Me.DEFAULT_VALUETextBox.Size = New System.Drawing.Size(315, 20) Me.DEFAULT_VALUETextBox.TabIndex = 12 ' 'DATATYPEComboBox ' Me.DATATYPEComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "DATATYPE", True)) Me.DATATYPEComboBox.FormattingEnabled = True - Me.DATATYPEComboBox.Location = New System.Drawing.Point(407, 60) + Me.DATATYPEComboBox.Location = New System.Drawing.Point(406, 60) Me.DATATYPEComboBox.Name = "DATATYPEComboBox" Me.DATATYPEComboBox.Size = New System.Drawing.Size(148, 21) Me.DATATYPEComboBox.TabIndex = 11 @@ -886,7 +886,7 @@ Partial Class frmGlobixAdministration Me.COMMENTTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "COMMENT", True)) Me.COMMENTTextBox.Location = New System.Drawing.Point(100, 155) Me.COMMENTTextBox.Name = "COMMENTTextBox" - Me.COMMENTTextBox.Size = New System.Drawing.Size(907, 20) + Me.COMMENTTextBox.Size = New System.Drawing.Size(905, 20) Me.COMMENTTextBox.TabIndex = 10 ' 'WD_INDEXComboBox @@ -895,7 +895,7 @@ Partial Class frmGlobixAdministration Me.WD_INDEXComboBox.FormattingEnabled = True Me.WD_INDEXComboBox.Location = New System.Drawing.Point(100, 60) Me.WD_INDEXComboBox.Name = "WD_INDEXComboBox" - Me.WD_INDEXComboBox.Size = New System.Drawing.Size(215, 21) + Me.WD_INDEXComboBox.Size = New System.Drawing.Size(214, 21) Me.WD_INDEXComboBox.TabIndex = 9 ' 'NAMETextBox @@ -903,7 +903,7 @@ Partial Class frmGlobixAdministration Me.NAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "NAME", True)) Me.NAMETextBox.Location = New System.Drawing.Point(100, 36) Me.NAMETextBox.Name = "NAMETextBox" - Me.NAMETextBox.Size = New System.Drawing.Size(907, 20) + Me.NAMETextBox.Size = New System.Drawing.Size(905, 20) Me.NAMETextBox.TabIndex = 8 ' 'SEQUENCENumericUpDown1 @@ -929,7 +929,7 @@ Partial Class frmGlobixAdministration Me.ACTIVECheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBDD_INDEX_MANBindingSource, "ACTIVE", True)) Me.ACTIVECheckBox.Location = New System.Drawing.Point(287, 12) Me.ACTIVECheckBox.Name = "ACTIVECheckBox" - Me.ACTIVECheckBox.Size = New System.Drawing.Size(268, 20) + Me.ACTIVECheckBox.Size = New System.Drawing.Size(267, 20) Me.ACTIVECheckBox.TabIndex = 5 Me.ACTIVECheckBox.Text = "Aktiv" Me.ACTIVECheckBox.UseVisualStyleBackColor = True @@ -940,7 +940,7 @@ Partial Class frmGlobixAdministration Me.ControlGroupIndexeMan.GroupBordersVisible = False Me.ControlGroupIndexeMan.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem11, Me.LayoutControlItem14, Me.LayoutControlItem15, Me.LayoutControlItem18, Me.LayoutControlItem12, Me.LayoutControlItem13, Me.EmptySpaceItem1, Me.LayoutControlItem16, Me.EmptySpaceItem2, Me.EmptySpaceItem3, Me.LayoutControlItem27, Me.LayoutControlItem29, Me.LayoutControlItem20, Me.LayoutControlItem22, Me.LayoutControlItem21, Me.LayoutControlItem31, Me.EmptySpaceItem10, Me.LayoutControlItem17, Me.LayoutControlItem39, Me.EmptySpaceItem11, Me.LayoutControlItem28, Me.LayoutControlItem30, Me.EmptySpaceItem17, Me.EmptySpaceItem18, Me.LayoutControlItem10}) Me.ControlGroupIndexeMan.Name = "ControlGroupIndexeMan" - Me.ControlGroupIndexeMan.Size = New System.Drawing.Size(1019, 259) + Me.ControlGroupIndexeMan.Size = New System.Drawing.Size(1017, 259) Me.ControlGroupIndexeMan.TextVisible = False ' 'LayoutControlItem11 @@ -948,7 +948,7 @@ Partial Class frmGlobixAdministration Me.LayoutControlItem11.Control = Me.ACTIVECheckBox Me.LayoutControlItem11.Location = New System.Drawing.Point(275, 0) Me.LayoutControlItem11.Name = "LayoutControlItem11" - Me.LayoutControlItem11.Size = New System.Drawing.Size(272, 24) + Me.LayoutControlItem11.Size = New System.Drawing.Size(271, 24) Me.LayoutControlItem11.Text = "ACTIVE:" Me.LayoutControlItem11.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem11.TextVisible = False @@ -958,7 +958,7 @@ Partial Class frmGlobixAdministration Me.LayoutControlItem14.Control = Me.NAMETextBox Me.LayoutControlItem14.Location = New System.Drawing.Point(0, 24) Me.LayoutControlItem14.Name = "LayoutControlItem14" - Me.LayoutControlItem14.Size = New System.Drawing.Size(999, 24) + Me.LayoutControlItem14.Size = New System.Drawing.Size(997, 24) Me.LayoutControlItem14.Text = "Bezeichnung:" Me.LayoutControlItem14.TextSize = New System.Drawing.Size(85, 13) ' @@ -967,7 +967,7 @@ Partial Class frmGlobixAdministration Me.LayoutControlItem15.Control = Me.WD_INDEXComboBox Me.LayoutControlItem15.Location = New System.Drawing.Point(0, 48) Me.LayoutControlItem15.Name = "LayoutControlItem15" - Me.LayoutControlItem15.Size = New System.Drawing.Size(307, 25) + Me.LayoutControlItem15.Size = New System.Drawing.Size(306, 25) Me.LayoutControlItem15.Text = "Attribut:" Me.LayoutControlItem15.TextSize = New System.Drawing.Size(85, 13) ' @@ -976,7 +976,7 @@ Partial Class frmGlobixAdministration Me.LayoutControlItem18.Control = Me.DEFAULT_VALUETextBox Me.LayoutControlItem18.Location = New System.Drawing.Point(0, 117) Me.LayoutControlItem18.Name = "LayoutControlItem18" - Me.LayoutControlItem18.Size = New System.Drawing.Size(408, 26) + Me.LayoutControlItem18.Size = New System.Drawing.Size(407, 26) Me.LayoutControlItem18.Text = "Standard-Wert:" Me.LayoutControlItem18.TextSize = New System.Drawing.Size(85, 13) ' @@ -998,21 +998,10 @@ Partial Class frmGlobixAdministration Me.LayoutControlItem13.Text = "Reihenfolge:" Me.LayoutControlItem13.TextSize = New System.Drawing.Size(85, 13) ' - 'LayoutControlItem10 - ' - Me.LayoutControlItem10.Control = Me.Button1 - Me.LayoutControlItem10.Location = New System.Drawing.Point(547, 48) - Me.LayoutControlItem10.MinSize = New System.Drawing.Size(24, 24) - Me.LayoutControlItem10.Name = "LayoutControlItem10" - Me.LayoutControlItem10.Size = New System.Drawing.Size(270, 25) - Me.LayoutControlItem10.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom - Me.LayoutControlItem10.TextSize = New System.Drawing.Size(0, 0) - Me.LayoutControlItem10.TextVisible = False - ' 'EmptySpaceItem1 ' Me.EmptySpaceItem1.AllowHotTrack = False - Me.EmptySpaceItem1.Location = New System.Drawing.Point(749, 167) + Me.EmptySpaceItem1.Location = New System.Drawing.Point(747, 167) Me.EmptySpaceItem1.Name = "EmptySpaceItem1" Me.EmptySpaceItem1.Size = New System.Drawing.Size(250, 24) Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0) @@ -1022,7 +1011,7 @@ Partial Class frmGlobixAdministration Me.LayoutControlItem16.Control = Me.COMMENTTextBox Me.LayoutControlItem16.Location = New System.Drawing.Point(0, 143) Me.LayoutControlItem16.Name = "LayoutControlItem16" - Me.LayoutControlItem16.Size = New System.Drawing.Size(999, 24) + Me.LayoutControlItem16.Size = New System.Drawing.Size(997, 24) Me.LayoutControlItem16.Text = "Beschreibung:" Me.LayoutControlItem16.TextSize = New System.Drawing.Size(85, 13) ' @@ -1031,15 +1020,15 @@ Partial Class frmGlobixAdministration Me.EmptySpaceItem2.AllowHotTrack = False Me.EmptySpaceItem2.Location = New System.Drawing.Point(0, 73) Me.EmptySpaceItem2.Name = "EmptySpaceItem2" - Me.EmptySpaceItem2.Size = New System.Drawing.Size(999, 44) + Me.EmptySpaceItem2.Size = New System.Drawing.Size(997, 44) Me.EmptySpaceItem2.TextSize = New System.Drawing.Size(0, 0) ' 'EmptySpaceItem3 ' Me.EmptySpaceItem3.AllowHotTrack = False - Me.EmptySpaceItem3.Location = New System.Drawing.Point(547, 0) + Me.EmptySpaceItem3.Location = New System.Drawing.Point(546, 0) Me.EmptySpaceItem3.Name = "EmptySpaceItem3" - Me.EmptySpaceItem3.Size = New System.Drawing.Size(452, 24) + Me.EmptySpaceItem3.Size = New System.Drawing.Size(451, 24) Me.EmptySpaceItem3.TextSize = New System.Drawing.Size(0, 0) ' 'LayoutControlItem27 @@ -1056,7 +1045,7 @@ Partial Class frmGlobixAdministration Me.LayoutControlItem29.Control = Me.CHANGED_WHOTextBox Me.LayoutControlItem29.Location = New System.Drawing.Point(239, 191) Me.LayoutControlItem29.Name = "LayoutControlItem29" - Me.LayoutControlItem29.Size = New System.Drawing.Size(273, 24) + Me.LayoutControlItem29.Size = New System.Drawing.Size(272, 24) Me.LayoutControlItem29.Text = "Geändert wer:" Me.LayoutControlItem29.TextSize = New System.Drawing.Size(85, 13) ' @@ -1065,7 +1054,7 @@ Partial Class frmGlobixAdministration Me.LayoutControlItem20.Control = Me.MULTISELECTCheckBox Me.LayoutControlItem20.Location = New System.Drawing.Point(0, 167) Me.LayoutControlItem20.Name = "LayoutControlItem20" - Me.LayoutControlItem20.Size = New System.Drawing.Size(249, 24) + Me.LayoutControlItem20.Size = New System.Drawing.Size(248, 24) Me.LayoutControlItem20.Text = "MULTISELECT:" Me.LayoutControlItem20.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem20.TextVisible = False @@ -1073,7 +1062,7 @@ Partial Class frmGlobixAdministration 'LayoutControlItem22 ' Me.LayoutControlItem22.Control = Me.VKT_PREVENT_MULTIPLE_VALUESCheckBox - Me.LayoutControlItem22.Location = New System.Drawing.Point(249, 167) + Me.LayoutControlItem22.Location = New System.Drawing.Point(248, 167) Me.LayoutControlItem22.Name = "LayoutControlItem22" Me.LayoutControlItem22.Size = New System.Drawing.Size(250, 24) Me.LayoutControlItem22.Text = "VKT PREVENT MULTIPLE VALUES:" @@ -1083,9 +1072,9 @@ Partial Class frmGlobixAdministration 'LayoutControlItem21 ' Me.LayoutControlItem21.Control = Me.VKT_ADD_ITEMCheckBox - Me.LayoutControlItem21.Location = New System.Drawing.Point(499, 167) + Me.LayoutControlItem21.Location = New System.Drawing.Point(498, 167) Me.LayoutControlItem21.Name = "LayoutControlItem21" - Me.LayoutControlItem21.Size = New System.Drawing.Size(250, 24) + Me.LayoutControlItem21.Size = New System.Drawing.Size(249, 24) Me.LayoutControlItem21.Text = "VKT ADD ITEM:" Me.LayoutControlItem21.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem21.TextVisible = False @@ -1093,7 +1082,7 @@ Partial Class frmGlobixAdministration 'LayoutControlItem31 ' Me.LayoutControlItem31.Control = Me.SimpleButton1 - Me.LayoutControlItem31.Location = New System.Drawing.Point(408, 117) + Me.LayoutControlItem31.Location = New System.Drawing.Point(407, 117) Me.LayoutControlItem31.Name = "LayoutControlItem31" Me.LayoutControlItem31.Size = New System.Drawing.Size(38, 26) Me.LayoutControlItem31.TextSize = New System.Drawing.Size(0, 0) @@ -1102,7 +1091,7 @@ Partial Class frmGlobixAdministration 'EmptySpaceItem10 ' Me.EmptySpaceItem10.AllowHotTrack = False - Me.EmptySpaceItem10.Location = New System.Drawing.Point(817, 48) + Me.EmptySpaceItem10.Location = New System.Drawing.Point(815, 48) Me.EmptySpaceItem10.Name = "EmptySpaceItem10" Me.EmptySpaceItem10.Size = New System.Drawing.Size(182, 25) Me.EmptySpaceItem10.TextSize = New System.Drawing.Size(0, 0) @@ -1110,7 +1099,7 @@ Partial Class frmGlobixAdministration 'LayoutControlItem17 ' Me.LayoutControlItem17.Control = Me.DATATYPEComboBox - Me.LayoutControlItem17.Location = New System.Drawing.Point(307, 48) + Me.LayoutControlItem17.Location = New System.Drawing.Point(306, 48) Me.LayoutControlItem17.Name = "LayoutControlItem17" Me.LayoutControlItem17.Size = New System.Drawing.Size(240, 25) Me.LayoutControlItem17.Text = "Datentyp:" @@ -1119,16 +1108,16 @@ Partial Class frmGlobixAdministration 'LayoutControlItem39 ' Me.LayoutControlItem39.Control = Me.ComboBox1 - Me.LayoutControlItem39.Location = New System.Drawing.Point(446, 117) + Me.LayoutControlItem39.Location = New System.Drawing.Point(445, 117) Me.LayoutControlItem39.Name = "LayoutControlItem39" - Me.LayoutControlItem39.Size = New System.Drawing.Size(303, 26) + Me.LayoutControlItem39.Size = New System.Drawing.Size(302, 26) Me.LayoutControlItem39.Text = "Systemvariablen:" Me.LayoutControlItem39.TextSize = New System.Drawing.Size(85, 13) ' 'EmptySpaceItem11 ' Me.EmptySpaceItem11.AllowHotTrack = False - Me.EmptySpaceItem11.Location = New System.Drawing.Point(749, 117) + Me.EmptySpaceItem11.Location = New System.Drawing.Point(747, 117) Me.EmptySpaceItem11.Name = "EmptySpaceItem11" Me.EmptySpaceItem11.Size = New System.Drawing.Size(250, 26) Me.EmptySpaceItem11.TextSize = New System.Drawing.Size(0, 0) @@ -1147,26 +1136,37 @@ Partial Class frmGlobixAdministration Me.LayoutControlItem30.Control = Me.CHANGED_WHENTextBox Me.LayoutControlItem30.Location = New System.Drawing.Point(239, 215) Me.LayoutControlItem30.Name = "LayoutControlItem30" - Me.LayoutControlItem30.Size = New System.Drawing.Size(273, 24) + Me.LayoutControlItem30.Size = New System.Drawing.Size(272, 24) Me.LayoutControlItem30.Text = "Geändert wann:" Me.LayoutControlItem30.TextSize = New System.Drawing.Size(85, 13) ' 'EmptySpaceItem17 ' Me.EmptySpaceItem17.AllowHotTrack = False - Me.EmptySpaceItem17.Location = New System.Drawing.Point(512, 191) + Me.EmptySpaceItem17.Location = New System.Drawing.Point(511, 191) Me.EmptySpaceItem17.Name = "EmptySpaceItem17" - Me.EmptySpaceItem17.Size = New System.Drawing.Size(487, 24) + Me.EmptySpaceItem17.Size = New System.Drawing.Size(486, 24) Me.EmptySpaceItem17.TextSize = New System.Drawing.Size(0, 0) ' 'EmptySpaceItem18 ' Me.EmptySpaceItem18.AllowHotTrack = False - Me.EmptySpaceItem18.Location = New System.Drawing.Point(512, 215) + Me.EmptySpaceItem18.Location = New System.Drawing.Point(511, 215) Me.EmptySpaceItem18.Name = "EmptySpaceItem18" - Me.EmptySpaceItem18.Size = New System.Drawing.Size(487, 24) + Me.EmptySpaceItem18.Size = New System.Drawing.Size(486, 24) Me.EmptySpaceItem18.TextSize = New System.Drawing.Size(0, 0) ' + 'LayoutControlItem10 + ' + Me.LayoutControlItem10.Control = Me.Button1 + Me.LayoutControlItem10.Location = New System.Drawing.Point(546, 48) + Me.LayoutControlItem10.MinSize = New System.Drawing.Size(24, 24) + Me.LayoutControlItem10.Name = "LayoutControlItem10" + Me.LayoutControlItem10.Size = New System.Drawing.Size(269, 25) + Me.LayoutControlItem10.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom + Me.LayoutControlItem10.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem10.TextVisible = False + ' 'ListBoxControlmanIndex ' Me.ListBoxControlmanIndex.DataSource = Me.TBDD_INDEX_MANBindingSource @@ -1174,7 +1174,7 @@ Partial Class frmGlobixAdministration Me.ListBoxControlmanIndex.Dock = System.Windows.Forms.DockStyle.Left Me.ListBoxControlmanIndex.Location = New System.Drawing.Point(0, 0) Me.ListBoxControlmanIndex.Name = "ListBoxControlmanIndex" - Me.ListBoxControlmanIndex.Size = New System.Drawing.Size(163, 259) + Me.ListBoxControlmanIndex.Size = New System.Drawing.Size(165, 259) Me.ListBoxControlmanIndex.TabIndex = 0 ' 'XtraTabPageRework @@ -1530,7 +1530,6 @@ Partial Class frmGlobixAdministration CType(Me.LayoutControlItem18, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem12, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem13, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem16, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.EmptySpaceItem2, System.ComponentModel.ISupportInitialize).EndInit() @@ -1549,6 +1548,7 @@ Partial Class frmGlobixAdministration CType(Me.LayoutControlItem30, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.EmptySpaceItem17, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.EmptySpaceItem18, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ListBoxControlmanIndex, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabPageAutoIndexe.ResumeLayout(False) CType(Me.LayoutControlAutoIndexe, System.ComponentModel.ISupportInitialize).EndInit() diff --git a/GUIs.ZooFlow/Globix/frmGlobixAdministration.resx b/GUIs.ZooFlow/Globix/frmGlobixAdministration.resx index ec42651a..91715575 100644 --- a/GUIs.ZooFlow/Globix/frmGlobixAdministration.resx +++ b/GUIs.ZooFlow/Globix/frmGlobixAdministration.resx @@ -193,6 +193,9 @@ 144, 17 + + 17, 17 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z @@ -222,6 +225,26 @@ NHY0aDRMMTQsMjR6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFMCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAxMyAxMyIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MTMgMTMiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs + YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy + Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iQXBwb2ludG1l + bnRFbmRDb250aW51ZUFycm93XzFfIj4NCiAgICA8cG9seWdvbiBwb2ludHM9IjIsNyA3LDIgNyw1IDEx + LDUgMTEsOSA3LDkgNywxMiAgIiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + + + 821, 17 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z @@ -351,41 +374,6 @@ LjEsMjguMSwyNy42LDI3LjZ6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== - - 144, 17 - - - 17, 17 - - - 17, 17 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFMCAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAxMyAxMyIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MTMgMTMiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs - YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy - Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iQXBwb2ludG1l - bnRFbmRDb250aW51ZUFycm93XzFfIj4NCiAgICA8cG9seWdvbiBwb2ludHM9IjIsNyA3LDIgNyw1IDEx - LDUgMTEsOSA3LDkgNywxMiAgIiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs= - - - - 821, 17 - - - 821, 17 - - - 17, 56 - 399, 17 diff --git a/GUIs.ZooFlow/My Project/Resources.Designer.vb b/GUIs.ZooFlow/My Project/Resources.Designer.vb index 84a5f2c5..2f2497d1 100644 --- a/GUIs.ZooFlow/My Project/Resources.Designer.vb +++ b/GUIs.ZooFlow/My Project/Resources.Designer.vb @@ -350,6 +350,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property actions_database() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("actions_database", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -410,6 +420,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property actions_deletecircled6() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("actions_deletecircled6", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -440,6 +460,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property actions_window() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("actions_window", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -570,6 +600,26 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property definednameuseinformula1() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("definednameuseinformula1", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property definednameuseinformula2() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("definednameuseinformula2", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -610,6 +660,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property del4() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("del4", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -630,6 +690,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property documentproperties() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("documentproperties", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -760,6 +830,26 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property pagesetup() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("pagesetup", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property pagesetup1() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("pagesetup1", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -860,6 +950,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property singlepageview() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("singlepageview", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -890,6 +990,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property windows() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("windows", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/GUIs.ZooFlow/My Project/Resources.resx b/GUIs.ZooFlow/My Project/Resources.resx index 325c63fd..6fb0e4af 100644 --- a/GUIs.ZooFlow/My Project/Resources.resx +++ b/GUIs.ZooFlow/My Project/Resources.resx @@ -151,9 +151,6 @@ ..\Resources\definednameuseinformula.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\about1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -163,12 +160,21 @@ ..\Resources\about2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\save4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\renamedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\DD_Icons_ICO_PMANAGER_128px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_window.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\pagesetup.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\ZOO_FLOW_ sysicon_256.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -178,15 +184,24 @@ ..\Resources\2_ZOO_FLOW_Abo_MouseOver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_deletecircled6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\CW_GEFUNDEN_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\definednameuseinformula1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\markcomplete.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_check3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_check2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\actions_addcircled3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -202,9 +217,6 @@ ..\Resources\save1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\del.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\bell_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -214,38 +226,41 @@ ..\Resources\del1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\CW_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Checked-outforEdit_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\actions_check.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\editquery.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\2_LUPE_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\actions_check1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\1_LOGO_ZOO_FLOW_DROP3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\about.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\actions_addcircled5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\highimportance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\save3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\save7.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\deletetable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\2_LUPE_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\documentproperties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_deletecircled5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -289,8 +304,17 @@ ..\Resources\doublenext.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\3_PERSON_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\del3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\actions_deletecircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\4_GLOBIX_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\del4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_addcircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -298,14 +322,14 @@ ..\Resources\bo_document.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\save4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\about.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_deletecircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\pagesetup1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\bo_appearance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\singlepageview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\save6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -313,23 +337,29 @@ ..\Resources\actions_deletecircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_database.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\1_LOGO_ZOO_FLOW1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\actions_edit.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_check1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_deletecircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\CW_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\editquery.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\3_PERSON_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\actions_edit1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_check2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\bo_appearance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_addcircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -337,8 +367,8 @@ ..\Resources\crossdatasourcefiltering.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\4_GLOBIX_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\save3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -349,8 +379,8 @@ ..\Resources\3_PERSON_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\actions_deletecircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\2_LUPE_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -361,19 +391,22 @@ ..\Resources\del2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\windows.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\1_LOGO_ZOO_FLOW_DROP2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\StatusAnnotations_Stop_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\del.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\GLOBIX_short.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\del3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\definednameuseinformula2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/actions_database.svg b/GUIs.ZooFlow/Resources/actions_database.svg new file mode 100644 index 00000000..af7a23c1 --- /dev/null +++ b/GUIs.ZooFlow/Resources/actions_database.svg @@ -0,0 +1,17 @@ + + + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/actions_deletecircled6.svg b/GUIs.ZooFlow/Resources/actions_deletecircled6.svg new file mode 100644 index 00000000..d8c9bb3f --- /dev/null +++ b/GUIs.ZooFlow/Resources/actions_deletecircled6.svg @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/actions_window.svg b/GUIs.ZooFlow/Resources/actions_window.svg new file mode 100644 index 00000000..a857a5e7 --- /dev/null +++ b/GUIs.ZooFlow/Resources/actions_window.svg @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/definednameuseinformula1.svg b/GUIs.ZooFlow/Resources/definednameuseinformula1.svg new file mode 100644 index 00000000..0d27a20b --- /dev/null +++ b/GUIs.ZooFlow/Resources/definednameuseinformula1.svg @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/definednameuseinformula2.svg b/GUIs.ZooFlow/Resources/definednameuseinformula2.svg new file mode 100644 index 00000000..0d27a20b --- /dev/null +++ b/GUIs.ZooFlow/Resources/definednameuseinformula2.svg @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/del4.svg b/GUIs.ZooFlow/Resources/del4.svg new file mode 100644 index 00000000..3ac92fc9 --- /dev/null +++ b/GUIs.ZooFlow/Resources/del4.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/documentproperties.svg b/GUIs.ZooFlow/Resources/documentproperties.svg new file mode 100644 index 00000000..a0e861c9 --- /dev/null +++ b/GUIs.ZooFlow/Resources/documentproperties.svg @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/pagesetup.svg b/GUIs.ZooFlow/Resources/pagesetup.svg new file mode 100644 index 00000000..4c4accb9 --- /dev/null +++ b/GUIs.ZooFlow/Resources/pagesetup.svg @@ -0,0 +1,18 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/pagesetup1.svg b/GUIs.ZooFlow/Resources/pagesetup1.svg new file mode 100644 index 00000000..4c4accb9 --- /dev/null +++ b/GUIs.ZooFlow/Resources/pagesetup1.svg @@ -0,0 +1,18 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/singlepageview.svg b/GUIs.ZooFlow/Resources/singlepageview.svg new file mode 100644 index 00000000..9664a189 --- /dev/null +++ b/GUIs.ZooFlow/Resources/singlepageview.svg @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/windows.svg b/GUIs.ZooFlow/Resources/windows.svg new file mode 100644 index 00000000..955f6c55 --- /dev/null +++ b/GUIs.ZooFlow/Resources/windows.svg @@ -0,0 +1,18 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 231f014f..0bba7a14 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -62,9 +62,6 @@ - - ..\GUIs.GlobalIndexer\bin\Debug\DigitalData.GUIs.GlobalIndexer.dll - P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\22_11_19\Independentsoft.Msg.dll @@ -454,6 +451,14 @@ {3dcd6d1a-c830-4241-b7e4-27430e7ea483} LookupControl + + {bcc6942f-cd4b-4b67-8200-1c0d002e7cc2} + RegexEditor + + + {3e7bc8a9-91ef-49b8-8110-2c01f664c24a} + SQLEditor + {B7D465A2-AE31-4CDF-A8B2-34B42D3EA84E} ClipboardWatcher @@ -462,6 +467,10 @@ {d20a6bf2-c7c6-4a7a-b34d-fa27d775a049} Common + + {40384b94-1f94-4249-9a5a-d02e0b346738} + GlobalIndexer + {44982F9B-6116-44E2-85D0-F39650B1EF99} Config @@ -747,6 +756,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/GUIs.ZooFlow/My Project/Resources.Designer.vb b/GUIs.ZooFlow/My Project/Resources.Designer.vb index f4e8a4a7..becd271f 100644 --- a/GUIs.ZooFlow/My Project/Resources.Designer.vb +++ b/GUIs.ZooFlow/My Project/Resources.Designer.vb @@ -630,6 +630,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property definednameuseinformula3() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("definednameuseinformula3", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -750,6 +760,26 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property editdatasource() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("editdatasource", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property editdatasource1() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("editdatasource1", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' diff --git a/GUIs.ZooFlow/My Project/Resources.resx b/GUIs.ZooFlow/My Project/Resources.resx index ee5b013b..d0a84b98 100644 --- a/GUIs.ZooFlow/My Project/Resources.resx +++ b/GUIs.ZooFlow/My Project/Resources.resx @@ -136,14 +136,14 @@ ..\Resources\doublenext2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\doublenext1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_addcircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\editquery.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_deletecircled6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\Checked-outforEdit_Color_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -154,9 +154,6 @@ ..\Resources\definednameuseinformula.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\about1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -166,18 +163,24 @@ ..\Resources\about2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\save4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\renamedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_addcircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\DD_Icons_ICO_PMANAGER_128px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\editdatasource1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\actions_window.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\pagesetup.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\ZOO_FLOW_ sysicon_256.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -187,8 +190,8 @@ ..\Resources\2_ZOO_FLOW_Abo_MouseOver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\actions_deletecircled6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\definednameuseinformula2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\CW_GEFUNDEN_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -202,6 +205,9 @@ ..\Resources\actions_check3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_check2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\actions_addcircled3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -211,54 +217,51 @@ ..\Resources\markcomplete1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\editdatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\updatedataextract.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\save1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\del.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\bell_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\save2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\doublenext.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\del1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\CW_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Checked-outforEdit_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\definednameuseinformula2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\actions_check.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\2_LUPE_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_check1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\1_LOGO_ZOO_FLOW_DROP3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\about.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\actions_addcircled5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\highimportance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\save3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\save7.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -280,14 +283,20 @@ ..\Resources\DD_Icons_ICO_PMANAGER_256px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\doublenext1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\ZooFlow-25.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\insertsheet.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_addcircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\actions_edit.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_edit2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -304,29 +313,32 @@ ..\Resources\about3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\pagesetup.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\doublenext.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\3_PERSON_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_add1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\del3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\bo_appearance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_deletecircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\4_GLOBIX_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\del4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_addcircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\bo_document.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\save4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\about.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\pagesetup1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -346,23 +358,23 @@ ..\Resources\1_LOGO_ZOO_FLOW1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\actions_edit.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\StatusAnnotations_Stop_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\actions_deletecircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_check1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\editquery.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\CW_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\3_PERSON_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\actions_edit1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_check2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\bo_appearance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_addcircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -370,8 +382,8 @@ ..\Resources\crossdatasourcefiltering.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\4_GLOBIX_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\save3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -382,8 +394,8 @@ ..\Resources\3_PERSON_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\actions_deletecircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\2_LUPE_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -400,16 +412,13 @@ ..\Resources\1_LOGO_ZOO_FLOW_DROP2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\StatusAnnotations_Stop_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\del.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\GLOBIX_short.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\actions_add1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\definednameuseinformula3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/definednameuseinformula3.svg b/GUIs.ZooFlow/Resources/definednameuseinformula3.svg new file mode 100644 index 00000000..0d27a20b --- /dev/null +++ b/GUIs.ZooFlow/Resources/definednameuseinformula3.svg @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/editdatasource.svg b/GUIs.ZooFlow/Resources/editdatasource.svg new file mode 100644 index 00000000..6e46621c --- /dev/null +++ b/GUIs.ZooFlow/Resources/editdatasource.svg @@ -0,0 +1,17 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/editdatasource1.svg b/GUIs.ZooFlow/Resources/editdatasource1.svg new file mode 100644 index 00000000..6e46621c --- /dev/null +++ b/GUIs.ZooFlow/Resources/editdatasource1.svg @@ -0,0 +1,17 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 02b53cc3..f639044d 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -793,6 +793,15 @@ + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_CWDataSearch.vb b/GUIs.ZooFlow/Administration/frmAdmin_CWDataSearch.vb deleted file mode 100644 index b2b02471..00000000 --- a/GUIs.ZooFlow/Administration/frmAdmin_CWDataSearch.vb +++ /dev/null @@ -1,15 +0,0 @@ -Public Class frmAdmin_CWDataSearch - Implements frmAdmin_Interface - - Public Property PrimaryKey As Integer Implements frmAdmin_Interface.PrimaryKey - Public Property HasChanges As Boolean Implements frmAdmin_Interface.HasChanges - Public Property IsInsert As Boolean Implements frmAdmin_Interface.IsInsert - - Public Function SaveData() As Boolean Implements frmAdmin_Interface.SaveData - Throw New NotImplementedException() - End Function - - Public Function DeleteData() As Boolean Implements frmAdmin_Interface.DeleteData - Throw New NotImplementedException() - End Function -End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb index 2ba738e9..bf811918 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb @@ -1,6 +1,8 @@ - +Imports DigitalData.GUIs.Common.Base + + Partial Class frmAdmin_CWProfile - Inherits frmAdmin_Base + Inherits BaseRibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. diff --git a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb index 1cb87d3d..edb9cdc1 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb @@ -9,11 +9,11 @@ Imports DigitalData.GUIs.Common Imports DigitalData.Modules.Logging Public Class frmAdmin_CWProfile - Implements frmAdmin_Interface + Implements IAdminForm - Public Property PrimaryKey As Integer Implements frmAdmin_Interface.PrimaryKey - Public Property HasChanges As Boolean Implements frmAdmin_Interface.HasChanges - Public Property IsInsert As Boolean Implements frmAdmin_Interface.IsInsert + Public Property PrimaryKey As Integer Implements IAdminForm.PrimaryKey + Public Property HasChanges As Boolean Implements IAdminForm.HasChanges + Public Property IsInsert As Boolean Implements IAdminForm.IsInsert Private Const BUTTON_REGEX_PROFILE = "BUTTON_REGEX_PROFILE" Private Const BUTTON_SEARCH_SQL = "BUTTON_SEARCH_SQL" @@ -26,11 +26,12 @@ Public Class frmAdmin_CWProfile Private Pages As ClassDetailPages Public Sub New(PrimaryKey As Integer) + MyBase.New(My.LogConfig) + ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. - Logger = My.LogConfig.GetLogger() Me.PrimaryKey = PrimaryKey Me.IsInsert = IsInsert End Sub @@ -86,7 +87,7 @@ Public Class frmAdmin_CWProfile AddHandler Pages.AnyControl_Focus, AddressOf AnyControl_Focus AddHandler Pages.AnyControl_Changed, AddressOf AnyControl_Changed Catch ex As Exception - ShowError(ex) + ShowErrorMessage(ex) End Try End Sub @@ -117,7 +118,7 @@ Public Class frmAdmin_CWProfile - Public Function SaveData() As Boolean Implements frmAdmin_Interface.SaveData + Public Function SaveData() As Boolean Implements IAdminForm.SaveData If Pages.CurrentPage Is Nothing Then Return False End If @@ -144,7 +145,7 @@ Public Class frmAdmin_CWProfile Return False Catch ex As Exception - ShowError(ex) + ShowErrorMessage(ex) Return False End Try End Function @@ -165,7 +166,7 @@ Public Class frmAdmin_CWProfile End If End Sub - Public Function DeleteData() As Boolean Implements frmAdmin_Interface.DeleteData + Public Function DeleteData() As Boolean Implements IAdminForm.DeleteData Throw New NotImplementedException() End Function @@ -199,7 +200,7 @@ Public Class frmAdmin_CWProfile Dim oTextEdit As TextEdit = sender If e.Button.Tag = BUTTON_SEARCH_SQL Then - Dim oForm As New frmSQLEditor(oTextEdit.EditValue) + Dim oForm As New frmSQLEditor(My.LogConfig, My.Database) With {.SQLString = oTextEdit.EditValue} Dim oResult = oForm.ShowDialog() If oResult = DialogResult.OK Then @@ -212,7 +213,7 @@ Public Class frmAdmin_CWProfile Dim oTextEdit As TextEdit = sender If e.Button.Tag = BUTTON_COUNT_SQL Then - Dim oForm As New frmSQLEditor(oTextEdit.EditValue) + Dim oForm As New frmSQLEditor(My.LogConfig, My.Database) With {.SQLString = oTextEdit.EditValue} Dim oResult = oForm.ShowDialog() If oResult = DialogResult.OK Then diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Globix.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Globix.Designer.vb index dd2eeeda..a80915ee 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Globix.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Globix.Designer.vb @@ -1,6 +1,8 @@ - +Imports DigitalData.GUIs.Common.Base + + Partial Class frmAdmin_Globix - Inherits frmAdmin_Base + Inherits BaseRibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb b/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb index a88839d0..ceb3bdb2 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb @@ -1,18 +1,18 @@ Imports DigitalData.Modules.Logging Public Class frmAdmin_Globix - Inherits frmAdmin_Base - Implements frmAdmin_Interface - Public Property HasChanges As Boolean = False Implements frmAdmin_Interface.HasChanges - Public Property IsInsert As Boolean = False Implements frmAdmin_Interface.IsInsert - Public Property PrimaryKey As Integer Implements frmAdmin_Interface.PrimaryKey + Implements IAdminForm + Public Property HasChanges As Boolean = False Implements IAdminForm.HasChanges + Public Property IsInsert As Boolean = False Implements IAdminForm.IsInsert + Public Property PrimaryKey As Integer Implements IAdminForm.PrimaryKey Public Sub New(PrimaryKey As Integer, Optional IsInsert As Boolean = False) + MyBase.New(My.LogConfig) + ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. - Logger = My.LogConfig.GetLogger() Me.PrimaryKey = PrimaryKey Me.IsInsert = IsInsert End Sub @@ -22,7 +22,7 @@ Public Class frmAdmin_Globix TBDD_DOKUMENTARTTableAdapter.Connection.ConnectionString = My.Database.CurrentSQLConnectionString Me.TBDD_DOKUMENTARTTableAdapter.Fill(Me.GlobixDataset.TBDD_DOKUMENTART, PrimaryKey) Catch ex As Exception - ShowError(ex) + ShowErrorMessage(ex) End Try End Sub @@ -51,7 +51,7 @@ Public Class frmAdmin_Globix End If End Sub - Public Function SaveData() As Boolean Implements frmAdmin_Interface.SaveData + Public Function SaveData() As Boolean Implements IAdminForm.SaveData Try TBDD_DOKUMENTARTBindingSource.EndEdit() @@ -70,7 +70,7 @@ Public Class frmAdmin_Globix Return True Catch ex As Exception - ShowError(ex) + ShowErrorMessage(ex) Return False End Try End Function @@ -79,7 +79,7 @@ Public Class frmAdmin_Globix End Sub - Public Function DeleteData() As Boolean Implements frmAdmin_Interface.DeleteData + Public Function DeleteData() As Boolean Implements IAdminForm.DeleteData Throw New NotImplementedException() End Function End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb index 28340374..39e5753e 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb @@ -1,6 +1,8 @@ - +Imports DigitalData.GUIs.Common.Base + + Partial Class frmAdmin_IDBAttribute - Inherits frmAdmin_Base + Inherits BaseRibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb index d990110b..c9bb2bb9 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb @@ -1,12 +1,9 @@ -Imports DigitalData.Modules.Logging +Public Class frmAdmin_IDBAttribute + Implements IAdminForm -Public Class frmAdmin_IDBAttribute - Inherits frmAdmin_Base - Implements frmAdmin_Interface - - Public Property HasChanges As Boolean = False Implements frmAdmin_Interface.HasChanges - Public Property IsInsert As Boolean = False Implements frmAdmin_Interface.IsInsert - Public Property PrimaryKey As Integer Implements frmAdmin_Interface.PrimaryKey + Public Property HasChanges As Boolean = False Implements IAdminForm.HasChanges + Public Property IsInsert As Boolean = False Implements IAdminForm.IsInsert + Public Property PrimaryKey As Integer Implements IAdminForm.PrimaryKey Public Sub New(PrimaryKey As Integer, Optional IsInsert As Boolean = False) ' Dieser Aufruf ist für den Designer erforderlich. @@ -22,7 +19,7 @@ Public Class frmAdmin_IDBAttribute TBIDB_ATTRIBUTE_TYPETableAdapter.Fill(DSIDB_Stammdaten.TBIDB_ATTRIBUTE_TYPE) VWIDB_BE_ATTRIBUTETableAdapter.FillByAttributeId(DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTE, PrimaryKey, 1) Catch ex As Exception - ShowError(ex) + ShowErrorMessage(ex) End Try End Sub @@ -51,7 +48,7 @@ Public Class frmAdmin_IDBAttribute End If End Sub - Public Function SaveData() As Boolean Implements frmAdmin_Interface.SaveData + Public Function SaveData() As Boolean Implements IAdminForm.SaveData Try VWIDB_BE_ATTRIBUTEBindingSource.EndEdit() @@ -72,7 +69,7 @@ Public Class frmAdmin_IDBAttribute Return True Catch ex As Exception - ShowError(ex) + ShowErrorMessage(ex) Return False End Try End Function @@ -87,12 +84,12 @@ Public Class frmAdmin_IDBAttribute WHERE (GUID = @GUID)" End Sub - Public Function DeleteData() As Boolean Implements frmAdmin_Interface.DeleteData + Public Function DeleteData() As Boolean Implements IAdminForm.DeleteData Try TBIDB_ATTRIBUTE_TYPETableAdapter.Delete(PrimaryKey) Return True Catch ex As Exception - ShowError(ex) + ShowErrorMessage(ex) Return False End Try End Function diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.Designer.vb index d810a618..5f706cb9 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.Designer.vb @@ -1,6 +1,8 @@ - _ +Imports DigitalData.GUIs.Common.Base + + Partial Class frmAdmin_IDBEntity - Inherits frmAdmin_Base + Inherits BaseRibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. _ diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.vb index 54a57ea0..037dae24 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.vb @@ -1,18 +1,18 @@ Imports DigitalData.Modules.Logging Public Class frmAdmin_IDBEntity - Inherits frmAdmin_Base - Implements frmAdmin_Interface - Public Property PrimaryKey As Integer Implements frmAdmin_Interface.PrimaryKey - Public Property HasChanges As Boolean Implements frmAdmin_Interface.HasChanges - Public Property IsInsert As Boolean Implements frmAdmin_Interface.IsInsert + Implements IAdminForm + Public Property PrimaryKey As Integer Implements IAdminForm.PrimaryKey + Public Property HasChanges As Boolean Implements IAdminForm.HasChanges + Public Property IsInsert As Boolean Implements IAdminForm.IsInsert Public Sub New(PrimaryKey As Integer, Optional IsInsert As Boolean = False) + MyBase.New(My.LogConfig) + ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. - Logger = My.LogConfig.GetLogger() Me.PrimaryKey = PrimaryKey Me.IsInsert = IsInsert End Sub @@ -21,7 +21,7 @@ Public Class frmAdmin_IDBEntity Try TBIDB_BUSINESS_ENTITYTableAdapter.Fill(DSIDB_Stammdaten.TBIDB_BUSINESS_ENTITY, PrimaryKey) Catch ex As Exception - ShowError(ex) + ShowErrorMessage(ex) End Try End Sub @@ -49,7 +49,7 @@ Public Class frmAdmin_IDBEntity End If End Sub - Public Function SaveData() As Boolean Implements frmAdmin_Interface.SaveData + Public Function SaveData() As Boolean Implements IAdminForm.SaveData Try TBIDB_BUSINESS_ENTITYBindingSource.EndEdit() @@ -68,17 +68,17 @@ Public Class frmAdmin_IDBEntity Return True Catch ex As Exception - ShowError(ex) + ShowErrorMessage(ex) Return False End Try End Function - Public Function DeleteData() As Boolean Implements frmAdmin_Interface.DeleteData + Public Function DeleteData() As Boolean Implements IAdminForm.DeleteData Try TBIDB_BUSINESS_ENTITYTableAdapter.Delete(PrimaryKey) Return True Catch ex As Exception - ShowError(ex) + ShowErrorMessage(ex) Return False End Try End Function diff --git a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb index ed0379ef..a1a2fc98 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb @@ -1,6 +1,8 @@ - +Imports DigitalData.GUIs.Common.Base + + Partial Class frmAdmin_SourceSQL - Inherits frmAdmin_Base + Inherits BaseRibbonForm 'Form overrides dispose to clean up the component list. diff --git a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb index 5c22c9b5..6769f1d6 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb @@ -2,13 +2,13 @@ Imports DevExpress.XtraLayout Public Class frmAdmin_SourceSQL - Implements frmAdmin_Interface + Implements IAdminForm - Public Property PrimaryKey As Integer Implements frmAdmin_Interface.PrimaryKey + Public Property PrimaryKey As Integer Implements IAdminForm.PrimaryKey - Public Property HasChanges As Boolean Implements frmAdmin_Interface.HasChanges + Public Property HasChanges As Boolean Implements IAdminForm.HasChanges - Public Property IsInsert As Boolean Implements frmAdmin_Interface.IsInsert + Public Property IsInsert As Boolean Implements IAdminForm.IsInsert Public Sub New(PrimaryKey As Integer) ' Dieser Aufruf ist für den Designer erforderlich. @@ -28,7 +28,7 @@ Public Class frmAdmin_SourceSQL ValidationHelper() Catch ex As Exception - ShowError(ex) + ShowErrorMessage(ex) End Try End Sub @@ -69,7 +69,7 @@ Public Class frmAdmin_SourceSQL Return oControlList End Function - Public Function SaveData() As Boolean Implements frmAdmin_Interface.SaveData + Public Function SaveData() As Boolean Implements IAdminForm.SaveData Try @@ -90,17 +90,17 @@ Public Class frmAdmin_SourceSQL Return True Catch ex As Exception - ShowError(ex) + ShowErrorMessage(ex) Return False End Try End Function - Public Function DeleteData() As Boolean Implements frmAdmin_Interface.DeleteData + Public Function DeleteData() As Boolean Implements IAdminForm.DeleteData Try TBZF_ADMIN_SOURCE_SQLTableAdapter.Delete(PrimaryKey) Return True Catch ex As Exception - ShowError(ex) + ShowErrorMessage(ex) Return False End Try End Function diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb index ace7b361..270c0430 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb @@ -1,9 +1,10 @@ Imports DevExpress.XtraGrid Imports DevExpress.XtraGrid.Views.Grid +Imports DigitalData.GUIs.Common.Base Partial Class frmAdmin_Start - Inherits frmAdmin_Base + Inherits BaseRibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb index f3ffb605..20bfba87 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb @@ -9,8 +9,6 @@ Imports DigitalData.GUIs.ZooFlow.Administration.ClassConstants Imports DevExpress.XtraGrid Public Class frmAdmin_Start - Inherits frmAdmin_Base - Private CurrentModule As String Private CurrentPage As String Private CurrentItem As ClassDetailForm.DetailData @@ -25,7 +23,7 @@ Public Class frmAdmin_Start TreeListMenu.ExpandAll() End Sub - Private Sub DetailForm_Closed(sender As Object, e As frmAdmin_Interface) + Private Sub DetailForm_Closed(sender As Object, e As IAdminForm) If e.HasChanges Then Load_SQLData() Load_GridData(DetailForm.DetailDataList.Item(CurrentPage)) @@ -103,7 +101,7 @@ Public Class frmAdmin_Start CurrentPage = e.Node.Tag.ToString End If Catch ex As Exception - ShowError(ex) + ShowErrorMessage(ex) End Try End Sub @@ -206,7 +204,7 @@ Public Class frmAdmin_Start End If End If Catch ex As Exception - ShowError(ex) + ShowErrorMessage(ex) End Try End Sub diff --git a/GUIs.ZooFlow/Globix/frmGlobixAdministration.vb b/GUIs.ZooFlow/Globix/frmGlobixAdministration.vb index 7c8bc544..e1970824 100644 --- a/GUIs.ZooFlow/Globix/frmGlobixAdministration.vb +++ b/GUIs.ZooFlow/Globix/frmGlobixAdministration.vb @@ -2,10 +2,10 @@ Imports DigitalData.Modules.Logging Public Class frmGlobixAdministration - Implements frmAdmin_Interface - Public Property PrimaryKey As Integer Implements frmAdmin_Interface.PrimaryKey - Public Property HasChanges As Boolean Implements frmAdmin_Interface.HasChanges - Public Property IsInsert As Boolean Implements frmAdmin_Interface.IsInsert + Implements IAdminForm + Public Property PrimaryKey As Integer Implements IAdminForm.PrimaryKey + Public Property HasChanges As Boolean Implements IAdminForm.HasChanges + Public Property IsInsert As Boolean Implements IAdminForm.IsInsert Private Logger As Logger Private CURRCOntrolGroup As LayoutControlGroup Public Sub New(PrimaryKey As Integer) @@ -105,7 +105,7 @@ Public Class frmGlobixAdministration End Sub - Public Function SaveData() As Boolean Implements frmAdmin_Interface.SaveData + Public Function SaveData() As Boolean Implements IAdminForm.SaveData Throw New NotImplementedException() End Function @@ -205,7 +205,7 @@ Public Class frmGlobixAdministration End Select End Sub - Public Function DeleteData() As Boolean Implements frmAdmin_Interface.DeleteData + Public Function DeleteData() As Boolean Implements IAdminForm.DeleteData Throw New NotImplementedException() End Function End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index f639044d..d5a38f4e 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -115,15 +115,6 @@ - - Form - - - frmAdmin_CWDataSearch.vb - - - Form - frmAdmin_CWProfile.vb @@ -142,7 +133,7 @@ Form - + frmAdmin_Globix.vb @@ -315,9 +306,6 @@ - - frmAdmin_CWDataSearch.vb - frmAdmin_CWProfile.vb From 18786bee338c40cb5fd00879a2dc8cf4ed091ae8 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 26 Apr 2021 16:31:41 +0200 Subject: [PATCH 53/82] Common: Improve BaseForms and ErrorHandler --- GUIs.Common/Base/BaseErrorHandler.vb | 20 ++++++----- GUIs.Common/Base/BaseForm.vb | 51 ++++++++++++++++++++++++++++ GUIs.Common/Base/BaseRibbonForm.vb | 15 +++++--- GUIs.Common/Common.vbproj | 3 ++ 4 files changed, 77 insertions(+), 12 deletions(-) create mode 100644 GUIs.Common/Base/BaseForm.vb diff --git a/GUIs.Common/Base/BaseErrorHandler.vb b/GUIs.Common/Base/BaseErrorHandler.vb index 85034d9f..87a06c70 100644 --- a/GUIs.Common/Base/BaseErrorHandler.vb +++ b/GUIs.Common/Base/BaseErrorHandler.vb @@ -14,9 +14,14 @@ Namespace Base _Form = Form End Sub - Public Sub ShowErrorMessage(Exception As Exception) + Public Sub ShowErrorMessage(Exception As Exception, Origin As String) + Dim oMessage = GetMessage(Exception, Origin) + ShowErrorMessage(Exception, Origin, oMessage) + End Sub + + Public Sub ShowErrorMessage(Exception As Exception, Origin As String, Message As String) _Logger.Error(Exception) - MessageBox.Show(GetMessage(Exception), _Form.Text, MessageBoxButtons.OK, MessageBoxIcon.Exclamation) + MessageBox.Show(Message, _Form.Text, MessageBoxButtons.OK, MessageBoxIcon.Error) End Sub Public Sub ShowInfoMessage(Text As String) @@ -24,8 +29,7 @@ Namespace Base MessageBox.Show(Text, _Form.Text, MessageBoxButtons.OK, MessageBoxIcon.Information) End Sub - Private Function GetMessage(Exception As Exception) As String - Dim oCallingClass = LogConfig.GetClassFullName(IncludeMethodNames:=True, Parts:=2) + Private Function GetMessage(Exception As Exception, Origin As String) As String Dim oMessage As String = String.Empty If TypeOf Exception Is SqlClient.SqlException Then @@ -37,13 +41,13 @@ Namespace Base ElseIf TypeOf Exception Is NoNullAllowedException Then oMessage = "Einige benötigte Felder wurde nicht ausgefüllt." Else - oMessage = $"Es ist ein unerwarteter Fehler in {oCallingClass} aufgetreten. Mehr Informationen finden Sie im Log." + oMessage = $"An unhandled exception occurred in {Origin}: " & vbNewLine & + Exception.Message & vbNewLine & vbNewLine & + "More information can be found in the Application Log." End If If _LogConfig.Debug Then - oMessage &= vbNewLine & vbNewLine & "== Debug Informationen ==" - oMessage &= vbNewLine & vbNewLine & "Die ursprüngliche Fehlermeldung lautet:" - oMessage &= vbNewLine & Exception.Message + oMessage &= vbNewLine & vbNewLine & "=== Debug Information ===" oMessage &= vbNewLine & vbNewLine & "Stacktrace:" oMessage &= vbNewLine & Exception.StackTrace End If diff --git a/GUIs.Common/Base/BaseForm.vb b/GUIs.Common/Base/BaseForm.vb new file mode 100644 index 00000000..ed66dec4 --- /dev/null +++ b/GUIs.Common/Base/BaseForm.vb @@ -0,0 +1,51 @@ + +Imports DevExpress.XtraEditors +Imports DigitalData.Modules.Logging + +Namespace Base + Public Class BaseForm + Inherits XtraForm + + Private ReadOnly _Logger As Logger + Private ReadOnly _ErrorHandler As BaseErrorHandler + + Protected ReadOnly Property Logger As Logger + Get + Return _Logger + End Get + End Property + + Public Sub New() + End Sub + + Public Sub New(LogConfig As LogConfig) + ' Get the full name of the inheriting form + ' so the log messages have the right classname + Dim oClassName = [GetType]().FullName + + ' My.LogConfig is undefined in the designer + _Logger = LogConfig.GetLogger(oClassName) + _ErrorHandler = New BaseErrorHandler(LogConfig, _Logger, Me) + + ' When you add something, be careful if it + ' depends on a global var like My.LogConfig + ' you might need to check for its existence with ? + End Sub + + ''' ============== PUBLIC METHODS ============== + Public Sub ShowInfoMessage(Message As String) + _ErrorHandler.ShowInfoMessage(Message) + End Sub + + Public Sub ShowErrorMessage(Exception As Exception) + Dim oCallingClass = LogConfig.GetClassFullName(IncludeMethodNames:=True, Parts:=2) + _ErrorHandler.ShowErrorMessage(Exception, oCallingClass) + End Sub + + Public Sub ShowErrorMessage(ErrorMessage As String) + Dim oCallingClass = LogConfig.GetClassFullName(IncludeMethodNames:=True, Parts:=2) + _ErrorHandler.ShowErrorMessage(New ApplicationException(ErrorMessage), oCallingClass) + End Sub + End Class +End Namespace + diff --git a/GUIs.Common/Base/BaseRibbonForm.vb b/GUIs.Common/Base/BaseRibbonForm.vb index 31498888..67b023c7 100644 --- a/GUIs.Common/Base/BaseRibbonForm.vb +++ b/GUIs.Common/Base/BaseRibbonForm.vb @@ -5,14 +5,16 @@ Imports DigitalData.Modules.Logging Namespace Base ''' ''' This BaseClass is used to provide common functionality like the Logger or ErrorHandler to all Forms - ''' To use it, create a form and change the `Inherits` statement in FormName.Designer.vb to this form, eg.: + ''' + ''' + ''' To use it, create a form and change the `Inherits` statement in FormName.Designer.vb to this form. ''' ''' Partial Class frmExample ''' Inherits BaseRibbonForm ''' ''' ... ''' End Class - ''' + ''' Public Class BaseRibbonForm Inherits RibbonForm @@ -43,13 +45,18 @@ Namespace Base End Sub ''' ============== PUBLIC METHODS ============== + Public Sub ShowInfoMessage(Message As String) + _ErrorHandler.ShowInfoMessage(Message) + End Sub Public Sub ShowErrorMessage(Exception As Exception) - _ErrorHandler.ShowErrorMessage(Exception) + Dim oCallingClass = LogConfig.GetClassFullName(IncludeMethodNames:=True, Parts:=2) + _ErrorHandler.ShowErrorMessage(Exception, oCallingClass) End Sub Public Sub ShowErrorMessage(ErrorMessage As String) - _ErrorHandler.ShowErrorMessage(New ApplicationException(ErrorMessage)) + Dim oCallingClass = LogConfig.GetClassFullName(IncludeMethodNames:=True, Parts:=2) + _ErrorHandler.ShowErrorMessage(New ApplicationException(ErrorMessage), oCallingClass) End Sub End Class End Namespace diff --git a/GUIs.Common/Common.vbproj b/GUIs.Common/Common.vbproj index 33c6ff7d..c0b4b222 100644 --- a/GUIs.Common/Common.vbproj +++ b/GUIs.Common/Common.vbproj @@ -89,6 +89,9 @@ + + Form + Form From af040e4ee9219de6fd14fdcaedc8573f058b5b87 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 26 Apr 2021 16:31:57 +0200 Subject: [PATCH 54/82] ZooFlow: Use Error Handling from Common --- GUIs.ZooFlow/frmFlowForm.Designer.vb | 8 +++-- GUIs.ZooFlow/frmFlowForm.vb | 45 ++++++++++++---------------- 2 files changed, 24 insertions(+), 29 deletions(-) diff --git a/GUIs.ZooFlow/frmFlowForm.Designer.vb b/GUIs.ZooFlow/frmFlowForm.Designer.vb index 547f3a9e..e5098d43 100644 --- a/GUIs.ZooFlow/frmFlowForm.Designer.vb +++ b/GUIs.ZooFlow/frmFlowForm.Designer.vb @@ -1,6 +1,8 @@ - +Imports DigitalData.GUIs.Common.Base + + Partial Class frmFlowForm - Inherits DevExpress.XtraEditors.XtraForm + Inherits BaseForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. @@ -23,7 +25,7 @@ Partial Class frmFlowForm Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim SplashScreenManager As DevExpress.XtraSplashScreen.SplashScreenManager = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, Nothing, true, true) + Dim SplashScreenManager As DevExpress.XtraSplashScreen.SplashScreenManager = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, Nothing, True, True) Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmFlowForm)) Me.NotifyIcon = New System.Windows.Forms.NotifyIcon(Me.components) Me.ContextMenuSystray = New System.Windows.Forms.ContextMenuStrip(Me.components) diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index c4cf7d21..22a70e64 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -18,7 +18,6 @@ Public Class frmFlowForm Private Const OPACITY_HIDDEN = 0.65 Private Const OPACITY_SHOWN = 0.85 - Private Logger As Logger Private DTIDB_SEARCHES As DataTable ' Common Helpers Classes @@ -58,6 +57,8 @@ Public Class frmFlowForm Private WithEvents Watcher As ClipboardWatcher.Watcher = ClipboardWatcher.Watcher.Singleton Public Sub New() + MyBase.New(My.LogConfig) + ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() @@ -66,9 +67,6 @@ Public Class frmFlowForm End Sub Private Sub frmFlowForm_Load(sender As Object, e As EventArgs) Handles Me.Load - ' === Initialize Logger === - Logger = My.LogConfig.GetLogger() - ' === Show Splash Screen === SplashScreenManager.ShowForm(Me, GetType(frmSplash), False, False) @@ -250,8 +248,7 @@ Public Class frmFlowForm ProfileLoader = New ClassProfileLoader(My.LogConfig, AppServerOrDB) ProfileLoader.LoadProfiles() Catch ex As Exception - Logger.Error(ex) - MsgBox("Error while initializing Clipboard Watcher!", MsgBoxStyle.Critical, Text) + ShowErrorMessage(ex) End Try Else My.Application.ClipboardWatcher.MonitoringActive = False @@ -291,6 +288,8 @@ Public Class frmFlowForm If oDT.Rows.Count = 0 Then Throw New ApplicationException("No Default Path configured for User!") + 'Logger.Warn("No Default Path configured for User. Skipping.") + 'Exit Sub End If Dim oFolderWatchPath = oDT.Rows.Item(0).Item("FOLDER_PATH") @@ -319,9 +318,7 @@ Public Class frmFlowForm 'FWFunction_STARTED = True FolderWatch.StartStop_FolderWatch() Catch ex As Exception - MsgBox($"Init_Folderwatch: Unexpected error while starting FolderWatch: {ex.Message}", MsgBoxStyle.Critical) - Logger.Error(ex) - Logger.Info($"Init_Folderwatch: Unexpected error: {ex.Message}") + ShowErrorMessage(ex) End Try Try @@ -350,8 +347,7 @@ Public Class frmFlowForm 'FWFunction_STARTED = True FolderWatch.StartStop_FolderWatchSCAN() Catch ex As Exception - MsgBox($"Init_Folderwatch: Unexpected error while starting FolderWatchScan: {ex.Message}", MsgBoxStyle.Critical) - Logger.Info($"Init_Folderwatch: Unexpected error: {ex.Message}") + ShowErrorMessage(ex) End Try End Sub @@ -529,12 +525,12 @@ Public Class frmFlowForm Private Function FormLoaded_Visible() As Boolean For Each frm As Form In Application.OpenForms If frm.Name.Equals("frmSearchStart") Or frm.Name.Equals("frmGlobix_Index") Or frm.Name.Equals("frmAdmin_Start") Then - Me.Visible = False - Exit Function + Return False End If Next - Me.Visible = True + TimerCheckActiveForms.Enabled = False + Return True End Function Private Sub DatenbankverbindungToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DatenbankverbindungToolStripMenuItem.Click @@ -542,13 +538,13 @@ Public Class frmFlowForm End Sub Private Sub TimerCheckActiveForms_Tick(sender As Object, e As EventArgs) Handles TimerCheckActiveForms.Tick - FormLoaded_Visible() - If Me.Visible = False Then Exit Sub + Visible = FormLoaded_Visible() + If Visible = False Then Exit Sub End Sub Private Sub NotifyIcon_DoubleClick(sender As Object, e As EventArgs) Handles NotifyIcon.DoubleClick - If Me.Visible = False Then - Me.Visible = True + If Visible = False Then + Visible = True TimerCheckActiveForms.Enabled = False End If End Sub @@ -657,7 +653,7 @@ Public Class frmFlowForm Next Show() Catch ex As Exception - MsgBox("Unexpected Error in Check_Dropped_Files:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + ShowErrorMessage(ex) Show() End Try @@ -673,8 +669,7 @@ Public Class frmFlowForm TimerCheckActiveForms.Enabled = True End If Catch ex As Exception - Logger.Error(ex) - MsgBox(ex.Message, MsgBoxStyle.Critical) + ShowErrorMessage(ex) End Try End Sub Sub NotifyIconReset() @@ -696,7 +691,7 @@ Public Class frmFlowForm End Select NotifyIcon.ShowBalloonTip(30000, NI_TITLE, NI_MESSAGE, oNIType) Catch ex As Exception - + ShowErrorMessage(ex) End Try End Sub Sub Start_Folderwatch() @@ -749,8 +744,7 @@ Public Class frmFlowForm Logger.Info("FWSCAN not started") End If Catch ex As Exception - Logger.Info("Error while starting folderwatch scan: " & ex.Message) - Logger.Error(ex.Message) + ShowErrorMessage(ex) End Try Try @@ -786,8 +780,7 @@ Public Class frmFlowForm Logger.Info("Folderwatch not started") End If Catch ex As Exception - Logger.Info("Error while starting folderwatch: " & ex.Message) - Logger.Error(ex.Message) + ShowErrorMessage(ex) End Try If TimerFolderwatch.Enabled = False Then From 2bf8a18277bc5d9505c26c3ee493b0d297348e1c Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 26 Apr 2021 16:32:19 +0200 Subject: [PATCH 55/82] Common: Version 1.7.4 --- GUIs.Common/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GUIs.Common/My Project/AssemblyInfo.vb b/GUIs.Common/My Project/AssemblyInfo.vb index 927ce452..6329051d 100644 --- a/GUIs.Common/My Project/AssemblyInfo.vb +++ b/GUIs.Common/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + From 817347af6fe48806bbd017c6c4c197ba8d0f14fb Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 26 Apr 2021 16:43:42 +0200 Subject: [PATCH 56/82] clean up --- Controls.SQLEditor/frmSQLEditor.vb | 2 +- GUIs.Common/Base/BaseErrorHandler.vb | 10 ++++++++++ GUIs.Common/Base/BaseForm.vb | 3 +-- GUIs.ZooFlow/frmFlowForm.vb | 6 +++--- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Controls.SQLEditor/frmSQLEditor.vb b/Controls.SQLEditor/frmSQLEditor.vb index d0bb01c9..c48c20c7 100644 --- a/Controls.SQLEditor/frmSQLEditor.vb +++ b/Controls.SQLEditor/frmSQLEditor.vb @@ -104,7 +104,7 @@ Public Class frmSQLEditor Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick If cmbConnections.SelectedItem Is Nothing Then - MsgBox("Bitte wählen sie einen ") + ShowErrorMessage("Bitte wählen sie eine Datenbank Verbindung!") Exit Sub End If diff --git a/GUIs.Common/Base/BaseErrorHandler.vb b/GUIs.Common/Base/BaseErrorHandler.vb index 87a06c70..2c9617a4 100644 --- a/GUIs.Common/Base/BaseErrorHandler.vb +++ b/GUIs.Common/Base/BaseErrorHandler.vb @@ -24,6 +24,16 @@ Namespace Base MessageBox.Show(Message, _Form.Text, MessageBoxButtons.OK, MessageBoxIcon.Error) End Sub + Public Sub ShowErrorMessage(Text As String) + _Logger.Info(Text) + MessageBox.Show(Text, _Form.Text, MessageBoxButtons.OK, MessageBoxIcon.Error) + End Sub + + Public Sub ShowWarningMessage(Text As String) + _Logger.Info(Text) + MessageBox.Show(Text, _Form.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning) + End Sub + Public Sub ShowInfoMessage(Text As String) _Logger.Info(Text) MessageBox.Show(Text, _Form.Text, MessageBoxButtons.OK, MessageBoxIcon.Information) diff --git a/GUIs.Common/Base/BaseForm.vb b/GUIs.Common/Base/BaseForm.vb index ed66dec4..f11cfabb 100644 --- a/GUIs.Common/Base/BaseForm.vb +++ b/GUIs.Common/Base/BaseForm.vb @@ -43,8 +43,7 @@ Namespace Base End Sub Public Sub ShowErrorMessage(ErrorMessage As String) - Dim oCallingClass = LogConfig.GetClassFullName(IncludeMethodNames:=True, Parts:=2) - _ErrorHandler.ShowErrorMessage(New ApplicationException(ErrorMessage), oCallingClass) + _ErrorHandler.ShowErrorMessage(ErrorMessage) End Sub End Class End Namespace diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index 22a70e64..dce6003e 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -287,9 +287,9 @@ Public Class frmFlowForm Dim oDT As DataTable = AppServerOrDB.GetDatatable("DD_ECM", oSql, "TBGI_FOLDERWATCH_USER", $"FOLDER_TYPE = 'DEFAULT' AND USER_ID = {My.Application.User.UserId}") If oDT.Rows.Count = 0 Then - Throw New ApplicationException("No Default Path configured for User!") - 'Logger.Warn("No Default Path configured for User. Skipping.") - 'Exit Sub + 'Throw New ApplicationException("No Default Path configured for User!") + Logger.Warn("No Default Path configured for User. Skipping.") + Exit Sub End If Dim oFolderWatchPath = oDT.Rows.Item(0).Item("FOLDER_PATH") From aa1e11b030408608eb049a28c5451c21362d0c70 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 29 Apr 2021 12:25:43 +0200 Subject: [PATCH 57/82] LookupGrid: Remove old Versions, Fix Null Value Text \o/ --- Controls.LookupGrid/LookupControl.Designer.vb | 38 --- Controls.LookupGrid/LookupControl.resx | 120 -------- Controls.LookupGrid/LookupControl.vb | 137 --------- Controls.LookupGrid/LookupControl.vbproj | 24 +- Controls.LookupGrid/LookupControl.vbproj.bak | 180 ------------ Controls.LookupGrid/LookupControl2.resx | 123 -------- Controls.LookupGrid/LookupControl2.vb | 272 ------------------ Controls.LookupGrid/LookupControl3.vb | 3 + Controls.LookupGrid/LookupGridHandler.vb | 21 -- Controls.LookupGrid/LookupGridLocalizer.vb | 24 ++ Controls.LookupGrid/LookupGridRegistration.vb | 26 -- .../LookupGridView.Designer.vb | 47 --- Controls.LookupGrid/LookupGridView.vb | 56 ---- 13 files changed, 28 insertions(+), 1043 deletions(-) delete mode 100644 Controls.LookupGrid/LookupControl.Designer.vb delete mode 100644 Controls.LookupGrid/LookupControl.resx delete mode 100644 Controls.LookupGrid/LookupControl.vb delete mode 100644 Controls.LookupGrid/LookupControl.vbproj.bak delete mode 100644 Controls.LookupGrid/LookupControl2.resx delete mode 100644 Controls.LookupGrid/LookupControl2.vb delete mode 100644 Controls.LookupGrid/LookupGridHandler.vb create mode 100644 Controls.LookupGrid/LookupGridLocalizer.vb delete mode 100644 Controls.LookupGrid/LookupGridRegistration.vb delete mode 100644 Controls.LookupGrid/LookupGridView.Designer.vb delete mode 100644 Controls.LookupGrid/LookupGridView.vb diff --git a/Controls.LookupGrid/LookupControl.Designer.vb b/Controls.LookupGrid/LookupControl.Designer.vb deleted file mode 100644 index ffdedd38..00000000 --- a/Controls.LookupGrid/LookupControl.Designer.vb +++ /dev/null @@ -1,38 +0,0 @@ - -Partial Class LookupControl - Inherits System.Windows.Forms.UserControl - - 'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - - Protected Overrides Sub Dispose(ByVal disposing As Boolean) - Try - If disposing AndAlso components IsNot Nothing Then - components.Dispose() - End If - Finally - MyBase.Dispose(disposing) - End Try - End Sub - - 'Wird vom Windows Form-Designer benötigt. - Private components As System.ComponentModel.IContainer - - 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. - 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. - 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - - Private Sub InitializeComponent() - Me.SuspendLayout() - ' - 'LookupControl - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.BackColor = System.Drawing.Color.Transparent - Me.Name = "LookupControl" - Me.Size = New System.Drawing.Size(270, 35) - Me.ResumeLayout(False) - - End Sub -End Class diff --git a/Controls.LookupGrid/LookupControl.resx b/Controls.LookupGrid/LookupControl.resx deleted file mode 100644 index 1af7de15..00000000 --- a/Controls.LookupGrid/LookupControl.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/Controls.LookupGrid/LookupControl.vb b/Controls.LookupGrid/LookupControl.vb deleted file mode 100644 index 7815ecb5..00000000 --- a/Controls.LookupGrid/LookupControl.vb +++ /dev/null @@ -1,137 +0,0 @@ - -Imports System.ComponentModel -Imports DevExpress.XtraEditors -Imports DevExpress.XtraEditors.Controls - -Public Class LookupControl - - Public Property MultiSelect As Boolean - - Public Property AllowAddNewValues As Boolean - - Public Property PreventDuplicates As Boolean - - - Public Property DataSource As DataTable - - Public Property SelectedValues As List(Of String) - Get - If _selectedValues Is Nothing Then - Return New List(Of String) - End If - - Return _selectedValues - End Get - Set(value As List(Of String)) - _selectedValues = value - - UpdateSelectedValues(value) - End Set - End Property - Private _selectedValues As List(Of String) - - Private _lookupControlMulti As GridLookUpEdit - Private _lookupControlSingle As ButtonEdit - - Private Const TAG_BUTTON_LOOKUP_FORM = "openLookupForm" - Private Const TEXT_NO_RECORDS = "Keine Datensätze ausgewählt" - Private Const TEXT_N_RECORDS = "{0} Datensätze ausgewählt" - - Private Function GetLookupForm() As frmLookupGrid - Dim oForm As New frmLookupGrid() With { - .MultiSelect = MultiSelect, - .AddNewValues = AllowAddNewValues, - .PreventDuplicates = PreventDuplicates, - .DataSource = DataSource, - .SelectedValues = SelectedValues, - .StartPosition = Windows.Forms.FormStartPosition.Manual, - .Location = PointToScreen(New System.Drawing.Point(Width, 0)) - } - - Return oForm - End Function - - Private Sub Grid_Load(sender As Object, e As EventArgs) Handles Me.Load - If MultiSelect = False Then - _lookupControlSingle = New ButtonEdit With { - .Dock = Windows.Forms.DockStyle.Fill - } - - AddHandler _lookupControlSingle.ButtonClick, AddressOf lookupControlSingle_ButtonClick - - Controls.Add(_lookupControlSingle) - Else - _lookupControlMulti = New GridLookUpEdit With { - .Dock = Windows.Forms.DockStyle.Fill - } - - With _lookupControlMulti.Properties - .View.OptionsBehavior.ReadOnly = True - .View.OptionsBehavior.Editable = False - .View.OptionsView.ShowColumnHeaders = False - .PopupFormSize = New System.Drawing.Size(.PopupFormSize.Width, 100) - End With - - _lookupControlMulti.Properties.Buttons.Add(New EditorButton() With { - .Kind = ButtonPredefines.Ellipsis, - .Tag = TAG_BUTTON_LOOKUP_FORM - }) - - AddHandler _lookupControlMulti.ButtonClick, AddressOf lookupControlMulti_ButtonClick - AddHandler _lookupControlMulti.EditValueChanging, AddressOf lookupControlMulti_EditValueChanging - - Controls.Add(_lookupControlMulti) - End If - - UpdateSelectedValues(SelectedValues) - End Sub - - Private Sub UpdateSelectedValues(Values As List(Of String)) - If MultiSelect = True Then - _lookupControlMulti.Properties.DataSource = Values - _lookupControlMulti.Properties.NullText = IIf(Values.Count = 0, TEXT_NO_RECORDS, String.Format(TEXT_N_RECORDS, Values.Count)) - Else - _lookupControlSingle.Text = Values.FirstOrDefault() - End If - End Sub - - Private Sub lookupControlMulti_EditValueChanging(sender As Object, e As ChangingEventArgs) - e.Cancel = True - End Sub - - Private Sub lookupControlMulti_ButtonClick(sender As Object, e As ButtonPressedEventArgs) - If e.Button.Tag <> TAG_BUTTON_LOOKUP_FORM Then - Exit Sub - End If - - Dim oForm As frmLookupGrid = GetLookupForm() - Dim oResult = oForm.ShowDialog() - - If oResult = Windows.Forms.DialogResult.OK Then - Dim oValues = oForm.SelectedValues - - UpdateSelectedValues(oValues) - - SelectedValues = oValues - End If - - oForm.Dispose() - End Sub - - Private Sub lookupControlSingle_ButtonClick(sender As Object, e As ButtonPressedEventArgs) - Dim oForm As frmLookupGrid = GetLookupForm() - Dim oResult = oForm.ShowDialog() - - If oResult = Windows.Forms.DialogResult.OK Then - Dim oValues = oForm.SelectedValues - - UpdateSelectedValues(oValues) - - SelectedValues = oValues - End If - - oForm.Dispose() - End Sub -End Class - - diff --git a/Controls.LookupGrid/LookupControl.vbproj b/Controls.LookupGrid/LookupControl.vbproj index 38f00b9a..e025f218 100644 --- a/Controls.LookupGrid/LookupControl.vbproj +++ b/Controls.LookupGrid/LookupControl.vbproj @@ -98,23 +98,7 @@ Form - - LookupControl.vb - - - UserControl - - - Component - - - - - LookupGridView.vb - - - Component - + True @@ -154,12 +138,6 @@ frmLookupGrid.vb - - LookupControl.vb - - - LookupControl2.vb - LookupControl3.vb diff --git a/Controls.LookupGrid/LookupControl.vbproj.bak b/Controls.LookupGrid/LookupControl.vbproj.bak deleted file mode 100644 index 42070850..00000000 --- a/Controls.LookupGrid/LookupControl.vbproj.bak +++ /dev/null @@ -1,180 +0,0 @@ - - - - - Debug - AnyCPU - {3DCD6D1A-C830-4241-B7E4-27430E7EA483} - Library - DigitalData.Controls.LookupGrid - DigitalData.Controls.LookupGrid - 512 - Windows - v4.6.1 - - - true - full - true - true - bin\Debug\ - DigitalData.Controls.LookupGrid.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - pdbonly - false - true - true - bin\Release\ - DigitalData.Controls.LookupGrid.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - On - - - Binary - - - Off - - - On - - - - False - - - False - D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.Office.v18.1.Core.dll - - - False - D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.Pdf.v18.1.Core.dll - - - False - D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.Printing.v18.1.Core.dll - - - False - D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.RichEdit.v18.1.Core.dll - - - False - D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.RichEdit.v18.1.Export.dll - - - - - - False - D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.XtraLayout.v18.1.dll - - - False - D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.XtraPrinting.v18.1.dll - - - - - - - - - - - - - - - - - - - - - - - - - frmLookupGrid.vb - - - Form - - - LookupControl.vb - - - UserControl - - - Component - - - - - LookupGridView.vb - - - Component - - - - True - Application.myapp - - - True - True - Resources.resx - - - True - Settings.settings - True - - - LookupGridControl.vb - - - Component - - - - - frmLookupGrid.vb - - - LookupControl.vb - - - LookupControl2.vb - - - - VbMyResourcesResXFileCodeGenerator - Resources.Designer.vb - My.Resources - Designer - - - - - MyApplicationCodeGenerator - Application.Designer.vb - - - SettingsSingleFileGenerator - My - Settings.Designer.vb - - - - - - - \ No newline at end of file diff --git a/Controls.LookupGrid/LookupControl2.resx b/Controls.LookupGrid/LookupControl2.resx deleted file mode 100644 index e5858cc2..00000000 --- a/Controls.LookupGrid/LookupControl2.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - False - - \ No newline at end of file diff --git a/Controls.LookupGrid/LookupControl2.vb b/Controls.LookupGrid/LookupControl2.vb deleted file mode 100644 index c3662fa3..00000000 --- a/Controls.LookupGrid/LookupControl2.vb +++ /dev/null @@ -1,272 +0,0 @@ -Imports System.ComponentModel -Imports System.Drawing -Imports System.Windows.Forms -Imports DevExpress.Accessibility -Imports DevExpress.XtraEditors -Imports DevExpress.XtraEditors.Drawing -Imports DevExpress.XtraEditors.Registrator -Imports DevExpress.XtraEditors.Repository -Imports DevExpress.XtraEditors.ViewInfo -Imports DevExpress.XtraEditors.Controls - - -Public Class LookupControl2 - Inherits GridLookUpEdit - - Public Delegate Sub SelectedValuesChangedHandler(sender As Object, SelectedValues As List(Of String)) - Public Event SelectedValuesChanged As SelectedValuesChangedHandler - - Public Property AllowAddNewValues As Boolean - Public Property PreventDuplicates As Boolean - Public Property DataSource As DataTable - - Public Property MultiSelect As Boolean - Get - Return _Multiselect - End Get - Set(value As Boolean) - SetDropdownButtonEnabled(value) - _MultiSelect = value - End Set - End Property - - Public Property SelectedValues As List(Of String) - Get - Return _SelectedValues - End Get - Set(value As List(Of String)) - UpdateSelectedValues(value) - End Set - End Property - - Public Overloads Property [ReadOnly] As Boolean - Get - Return _ReadOnly - End Get - Set(value As Boolean) - SetFormButtonEnabled(Not value) - _ReadOnly = value - End Set - End Property - - Private ReadOnly _LookupFormButton As EditorButton - - Private Const TAG_DROPDOWN = "openDropdown" - Private Const TAG_BUTTON_LOOKUP_FORM = "openLookupForm" - - Private _R As Resources.ResourceManager = My.Resources.Strings.ResourceManager - Private _SelectedValues As New List(Of String) - Private _MultiSelect As Boolean - - Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView - Friend WithEvents GridView2 As DevExpress.XtraGrid.Views.Grid.GridView - Friend WithEvents fProperties As RepositoryItemGridLookUpEdit - Friend WithEvents fPropertiesView As DevExpress.XtraGrid.Views.Grid.GridView - Private _ReadOnly As Boolean = False - - Shared Sub New() - RepositoryItemLookupControl2.RegisterLookupControl2() - End Sub - - Public Sub New() - MyClass.New(MultiSelect:=False) - End Sub - - Public Sub New(MultiSelect As Boolean) - _LookupFormButton = New EditorButton() With { - .Kind = ButtonPredefines.Search, - .Tag = TAG_BUTTON_LOOKUP_FORM, - .Width = 20 - } - - Properties.Buttons.Item(0).Tag = TAG_DROPDOWN - Properties.Buttons.AddRange({_LookupFormButton}) - Properties.NullText = _R.GetString("LookupControl_NoRecords") - - AddHandler ButtonClick, AddressOf HandleButtonClick - AddHandler EditValueChanging, AddressOf HandleEditValueChanging - AddHandler QueryPopUp, AddressOf HandleQueryPopup - End Sub - - Private Sub SetFormButtonEnabled(pVisible As Boolean) - Dim oButton As EditorButton = Properties.Buttons. - Where(Function(b) b.Tag = TAG_BUTTON_LOOKUP_FORM). - FirstOrDefault() - - If oButton IsNot Nothing Then - oButton.Visible = pVisible - End If - End Sub - - Private Sub SetDropdownButtonEnabled(pVisible As Boolean) - Dim oButton As EditorButton = Properties.Buttons. - Where(Function(b) b.Tag = TAG_DROPDOWN). - FirstOrDefault() - - If oButton IsNot Nothing Then - oButton.Visible = pVisible - End If - End Sub - - ''' - ''' Prevents popup from opening when multiselect is false - ''' - Private Sub HandleQueryPopup(sender As Object, e As CancelEventArgs) - If MultiSelect = False Then - e.Cancel = True - End If - End Sub - - ''' - ''' Prevents Editvalue changing when multiselect is true - ''' - Private Sub HandleEditValueChanging(sender As Object, e As ChangingEventArgs) - If MultiSelect Then - e.Cancel = True - End If - End Sub - - ''' - ''' Handles opening frmLookup when ellipsis button is clicked - ''' - Private Sub HandleButtonClick(sender As Object, e As ButtonPressedEventArgs) - Select Case e.Button.Tag - Case TAG_BUTTON_LOOKUP_FORM - Using oForm = GetLookupForm() - Dim oResult = oForm.ShowDialog() - - If oResult = Windows.Forms.DialogResult.OK Then - Dim oValues = oForm.SelectedValues - UpdateSelectedValues(oValues) - End If - End Using - End Select - End Sub - - Private Sub UpdateSelectedValues(Values As List(Of String)) - If Values Is Nothing Then - Exit Sub - End If - - Values.RemoveAll(Function(v) String.IsNullOrEmpty(v)) - - If MultiSelect = True Then - Properties.DataSource = Values - - Select Case Values.Count - Case 0 - Properties.NullText = _R.GetString("LookupControl_NoRecords") - Case 1 - Properties.NullText = _R.GetString("LookupControl_OneRecord") - Case Else - Properties.NullText = String.Format(_R.GetString("LookupControl_NRecords"), Values.Count) - End Select - Else - Properties.NullText = Values.FirstOrDefault() - Text = Values.FirstOrDefault() - EditValue = Nothing - End If - - _SelectedValues = Values - - RaiseEvent SelectedValuesChanged(Me, Values) - End Sub - - Private Function GetLookupForm() As frmLookupGrid - Dim oForm As New frmLookupGrid() With { - .MultiSelect = MultiSelect, - .AddNewValues = AllowAddNewValues, - .PreventDuplicates = PreventDuplicates, - .DataSource = DataSource, - .SelectedValues = SelectedValues, - .StartPosition = FormStartPosition.Manual, - .Location = PointToScreen(New Point(Width, 0)) - } - - Return oForm - End Function - - - Public Shadows ReadOnly Property Properties As RepositoryItemLookupControl2 - Get - Return TryCast(MyBase.Properties, RepositoryItemLookupControl2) - End Get - End Property - - Public Overrides ReadOnly Property EditorTypeName As String - Get - Return RepositoryItemLookupControl2.CustomEditName - End Get - End Property - - Private Sub InitializeComponent() - Me.fProperties = New DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit() - Me.fPropertiesView = New DevExpress.XtraGrid.Views.Grid.GridView() - CType(Me.fProperties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.fPropertiesView, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SuspendLayout() - ' - 'fProperties - ' - Me.fProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.fProperties.Name = "fProperties" - Me.fProperties.PopupView = Me.fPropertiesView - ' - 'fPropertiesView - ' - Me.fPropertiesView.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus - Me.fPropertiesView.Name = "fPropertiesView" - Me.fPropertiesView.OptionsSelection.EnableAppearanceFocusedCell = False - Me.fPropertiesView.OptionsView.ShowGroupPanel = False - CType(Me.fProperties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.fPropertiesView, System.ComponentModel.ISupportInitialize).EndInit() - Me.ResumeLayout(False) - - End Sub -End Class - - -Public Class RepositoryItemLookupControl2 - Inherits RepositoryItemGridLookUpEdit - - Shared Sub New() - RegisterLookupControl2() - End Sub - - Public Const CustomEditName As String = "LookupControl2" - - Public Overrides ReadOnly Property EditorTypeName As String - Get - Return CustomEditName - End Get - End Property - - Public Shared Sub RegisterLookupControl2() - Dim img As Image = Nothing - EditorRegistrationInfo.Default.Editors.Add( - New EditorClassInfo( - CustomEditName, - GetType(LookupControl2), - GetType(RepositoryItemLookupControl2), - GetType(GridLookUpEditBaseViewInfo), - New ButtonEditPainter(), - True, - img, - GetType(ButtonEditAccessible) - ) - ) - End Sub - - Public Overrides Sub Assign(item As RepositoryItem) - BeginUpdate() - Try - MyBase.Assign(item) - Dim source As RepositoryItemLookupControl2 = TryCast(item, RepositoryItemLookupControl2) - If source Is Nothing Then - Return - End If - Finally - EndUpdate() - End Try - End Sub -End Class diff --git a/Controls.LookupGrid/LookupControl3.vb b/Controls.LookupGrid/LookupControl3.vb index 11852848..a107ee38 100644 --- a/Controls.LookupGrid/LookupControl3.vb +++ b/Controls.LookupGrid/LookupControl3.vb @@ -47,6 +47,7 @@ Public Class RepositoryItemLookupControl3 Public Sub New() SetDropdownButtonEnabled(_MultiSelect) + End Sub Private Const NAME_DATATABLE_INTERNAL = "__INTERNAL_DATATABLE__" @@ -114,6 +115,8 @@ Public Class RepositoryItemLookupControl3 GetType(ButtonEditAccessible) ) EditorRegistrationInfo.Default.Editors.Add(oClassInfo) + + End Sub Private Sub SetFormButtonEnabled(pVisible As Boolean) diff --git a/Controls.LookupGrid/LookupGridHandler.vb b/Controls.LookupGrid/LookupGridHandler.vb deleted file mode 100644 index 1ff6e7be..00000000 --- a/Controls.LookupGrid/LookupGridHandler.vb +++ /dev/null @@ -1,21 +0,0 @@ -Imports System.Windows.Forms -Imports DevExpress.XtraGrid.Views.Grid - -Namespace LookupGrid - Public Class LookupGridHandler - Inherits Handler.GridHandler - - Public Sub New(ByVal gridView As GridView) - MyBase.New(gridView) - End Sub - - Protected Overrides Sub OnKeyDown(ByVal e As KeyEventArgs) - MyBase.OnKeyDown(e) - If e.KeyData = Keys.Delete AndAlso View.State = GridState.Normal Then - View.DeleteRow(View.FocusedRowHandle) - End If - End Sub - End Class - -End Namespace - diff --git a/Controls.LookupGrid/LookupGridLocalizer.vb b/Controls.LookupGrid/LookupGridLocalizer.vb new file mode 100644 index 00000000..6d47d58c --- /dev/null +++ b/Controls.LookupGrid/LookupGridLocalizer.vb @@ -0,0 +1,24 @@ +Imports DevExpress.XtraEditors.Controls + +Public Class LookupGridLocalizer + Inherits EditResLocalizer + + Private Const LANG_DE = "de-DE" + + Public Overrides Function GetLocalizedString(id As StringId) As String + Dim oResult As String + + Select Case id + Case StringId.LookUpEditValueIsNull + If Language = LANG_DE Then + oResult = "[Kein Wert ausgewählt]" + Else + oResult = "[No Value selected]" + End If + Case Else + oResult = MyBase.GetLocalizedString(id) + End Select + + Return oResult + End Function +End Class diff --git a/Controls.LookupGrid/LookupGridRegistration.vb b/Controls.LookupGrid/LookupGridRegistration.vb deleted file mode 100644 index 44571ac1..00000000 --- a/Controls.LookupGrid/LookupGridRegistration.vb +++ /dev/null @@ -1,26 +0,0 @@ -Imports DevExpress.XtraGrid -Imports DevExpress.XtraGrid.Views.Base -Imports DevExpress.XtraGrid.Views.Base.Handler -Imports DevExpress.XtraGrid.Registrator - -Namespace LookupGrid - Public Class LookupGridViewInfoRegistrator - Inherits GridInfoRegistrator - - Public Overrides ReadOnly Property ViewName() As String - Get - Return "GridView" - End Get - End Property - Public Overrides Function CreateView(ByVal grid As GridControl) As BaseView - Return New LookupGridView(TryCast(grid, GridControl)) - End Function - Public Overrides Function CreateHandler(ByVal view As BaseView) As BaseViewHandler - Return New LookupGridHandler(TryCast(view, LookupGridView)) - End Function - End Class - - - -End Namespace - diff --git a/Controls.LookupGrid/LookupGridView.Designer.vb b/Controls.LookupGrid/LookupGridView.Designer.vb deleted file mode 100644 index d7a21e07..00000000 --- a/Controls.LookupGrid/LookupGridView.Designer.vb +++ /dev/null @@ -1,47 +0,0 @@ -Partial Class LookupGridView - Inherits System.ComponentModel.Component - - - Public Sub New(ByVal container As System.ComponentModel.IContainer) - MyClass.New() - - 'Erforderlich für die Unterstützung des Windows.Forms-Klassenkompositions-Designers - If (container IsNot Nothing) Then - container.Add(Me) - End If - - End Sub - - - Public Sub New() - MyBase.New() - - 'Dieser Aufruf ist für den Komponenten-Designer erforderlich. - InitializeComponent() - - End Sub - - 'Die Komponente überschreibt den Löschvorgang zum Bereinigen der Komponentenliste. - - Protected Overrides Sub Dispose(ByVal disposing As Boolean) - Try - If disposing AndAlso components IsNot Nothing Then - components.Dispose() - End If - Finally - MyBase.Dispose(disposing) - End Try - End Sub - - 'Wird vom Komponenten-Designer benötigt. - Private components As System.ComponentModel.IContainer - - 'Hinweis: Die folgende Prozedur ist für den Komponenten-Designer erforderlich. - 'Das Bearbeiten ist mit dem Komponenten-Designer möglich. - 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - - Private Sub InitializeComponent() - components = New System.ComponentModel.Container() - End Sub - -End Class diff --git a/Controls.LookupGrid/LookupGridView.vb b/Controls.LookupGrid/LookupGridView.vb deleted file mode 100644 index 101e270f..00000000 --- a/Controls.LookupGrid/LookupGridView.vb +++ /dev/null @@ -1,56 +0,0 @@ -Imports DevExpress.Data.Helpers -Imports DevExpress.Data.Filtering -Imports DevExpress.XtraGrid.Views.Base -Imports System.Reflection - -Namespace LookupGrid - Public Class LookupGridView - Inherits DevExpress.XtraGrid.Views.Grid.GridView - - Private _simpleSearch As Boolean - Public Sub New() - Me.New(Nothing) - End Sub - Public Property SimpleSearch() As Boolean - Get - Return _simpleSearch - End Get - Set(ByVal value As Boolean) - _simpleSearch = value - End Set - End Property - - Public Sub New(ByVal grid As DevExpress.XtraGrid.GridControl) - MyBase.New(grid) - ' put your initialization code here - End Sub - Protected Overrides ReadOnly Property ViewName() As String - Get - Return "LookupGridView" - End Get - End Property - Protected Overrides Function ConvertGridFilterToDataFilter(ByVal criteria As CriteriaOperator) As CriteriaOperator - Dim originalFindFilterText As String = Convert.ToString(GetType(ColumnView).InvokeMember("findFilterText", BindingFlags.Instance Or BindingFlags.NonPublic Or BindingFlags.GetField, Nothing, Me, New Object() {})) - If SimpleSearch Then - If Not (String.IsNullOrEmpty(originalFindFilterText)) Then - GetType(ColumnView).InvokeMember("findFilterText", BindingFlags.Instance Or BindingFlags.NonPublic Or BindingFlags.SetField, Nothing, Me, New Object() {String.Concat("""", originalFindFilterText, """")}) - End If - Dim findCriteria As CriteriaOperator = Nothing - Dim _lastParserResults As FindSearchParserResults = Nothing - If Not (String.IsNullOrEmpty(FindFilterText)) Then - _lastParserResults = (New FindSearchParser()).Parse(FindFilterText, GetFindToColumnsCollection()) - GetType(ColumnView).GetField("lastParserResults", BindingFlags.NonPublic Or BindingFlags.Instance).SetValue(Me, _lastParserResults) - If Not IsServerMode Then - _lastParserResults.AppendColumnFieldPrefixes() - End If - findCriteria = DxFtsContainsHelperAlt.Create(_lastParserResults, FilterCondition.Contains, IsServerMode) - End If - GetType(ColumnView).InvokeMember("findFilterText", BindingFlags.Instance Or BindingFlags.NonPublic Or BindingFlags.SetField, Nothing, Me, New Object() {originalFindFilterText}) - Return criteria And findCriteria - End If - Return MyBase.ConvertGridFilterToDataFilter(criteria) - End Function - End Class - -End Namespace - From 91ad6fe33d2d4ac04ef6c330fd1b072837c495fa Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 29 Apr 2021 12:25:57 +0200 Subject: [PATCH 58/82] LookupGrid: Version 3.1.0 --- Controls.LookupGrid/My Project/AssemblyInfo.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Controls.LookupGrid/My Project/AssemblyInfo.vb b/Controls.LookupGrid/My Project/AssemblyInfo.vb index 7c036300..8c5cb217 100644 --- a/Controls.LookupGrid/My Project/AssemblyInfo.vb +++ b/Controls.LookupGrid/My Project/AssemblyInfo.vb @@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + From fc014a57efb324181ced6b3869d15a0517a03dd3 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 29 Apr 2021 16:05:28 +0200 Subject: [PATCH 59/82] Common: Dont swallow sql exceptions --- GUIs.Common/Base/BaseErrorHandler.vb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/GUIs.Common/Base/BaseErrorHandler.vb b/GUIs.Common/Base/BaseErrorHandler.vb index 2c9617a4..87bcae17 100644 --- a/GUIs.Common/Base/BaseErrorHandler.vb +++ b/GUIs.Common/Base/BaseErrorHandler.vb @@ -47,6 +47,8 @@ Namespace Base Select Case oNumber Case 2627 oMessage = "Es wurde ein Doppelter Wert in eine Spalte eingetragen, die einzigartig sein muss." + Case Else + oMessage = Exception.Message End Select ElseIf TypeOf Exception Is NoNullAllowedException Then oMessage = "Einige benötigte Felder wurde nicht ausgefüllt." From 81932eaab69d484c0f55439bb1474de2ab5965ae Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 29 Apr 2021 16:06:50 +0200 Subject: [PATCH 60/82] Common: Version 1.7.5 --- GUIs.Common/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GUIs.Common/My Project/AssemblyInfo.vb b/GUIs.Common/My Project/AssemblyInfo.vb index 6329051d..cf9738ea 100644 --- a/GUIs.Common/My Project/AssemblyInfo.vb +++ b/GUIs.Common/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + From c33d5ff3403c7fb6d6349d850ff181bd28f351b6 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 29 Apr 2021 16:08:31 +0200 Subject: [PATCH 61/82] SQLEditor: Minor Tweaks --- Controls.SQLEditor/frmSQLEditor.Designer.vb | 58 ++++++++++----------- Controls.SQLEditor/frmSQLEditor.resx | 2 +- Controls.SQLEditor/frmSQLEditor.vb | 18 +++---- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/Controls.SQLEditor/frmSQLEditor.Designer.vb b/Controls.SQLEditor/frmSQLEditor.Designer.vb index 053619f6..922dbfba 100644 --- a/Controls.SQLEditor/frmSQLEditor.Designer.vb +++ b/Controls.SQLEditor/frmSQLEditor.Designer.vb @@ -22,17 +22,17 @@ Partial Class frmSQLEditor Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim EditorButtonImageOptions3 As DevExpress.XtraEditors.Controls.EditorButtonImageOptions = New DevExpress.XtraEditors.Controls.EditorButtonImageOptions() + Dim EditorButtonImageOptions1 As DevExpress.XtraEditors.Controls.EditorButtonImageOptions = New DevExpress.XtraEditors.Controls.EditorButtonImageOptions() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSQLEditor)) - Dim SerializableAppearanceObject9 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() - Dim SerializableAppearanceObject10 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() - Dim SerializableAppearanceObject11 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() - Dim SerializableAppearanceObject12 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() - Dim EditorButtonImageOptions4 As DevExpress.XtraEditors.Controls.EditorButtonImageOptions = New DevExpress.XtraEditors.Controls.EditorButtonImageOptions() - Dim SerializableAppearanceObject13 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() - Dim SerializableAppearanceObject14 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() - Dim SerializableAppearanceObject15 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() - Dim SerializableAppearanceObject16 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject1 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject2 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject3 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject4 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim EditorButtonImageOptions2 As DevExpress.XtraEditors.Controls.EditorButtonImageOptions = New DevExpress.XtraEditors.Controls.EditorButtonImageOptions() + Dim SerializableAppearanceObject5 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject6 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject7 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject8 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() Me.RepositoryItemRibbonSearchEdit2 = New DevExpress.XtraBars.Ribbon.Internal.RepositoryItemRibbonSearchEdit() Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() Me.GridControlPlaceholders = New DevExpress.XtraGrid.GridControl() @@ -111,9 +111,9 @@ Partial Class frmSQLEditor Me.RepositoryItemRibbonSearchEdit2.AllowFocused = False Me.RepositoryItemRibbonSearchEdit2.AutoHeight = False Me.RepositoryItemRibbonSearchEdit2.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder - EditorButtonImageOptions3.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.[True] - EditorButtonImageOptions3.SvgImage = CType(resources.GetObject("EditorButtonImageOptions3.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.RepositoryItemRibbonSearchEdit2.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, True, True, True, EditorButtonImageOptions3, New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), SerializableAppearanceObject9, SerializableAppearanceObject10, SerializableAppearanceObject11, SerializableAppearanceObject12, "", Nothing, Nothing, DevExpress.Utils.ToolTipAnchor.[Default]), New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Clear, "", -1, True, False, False, EditorButtonImageOptions4, New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), SerializableAppearanceObject13, SerializableAppearanceObject14, SerializableAppearanceObject15, SerializableAppearanceObject16, "", Nothing, Nothing, DevExpress.Utils.ToolTipAnchor.[Default])}) + EditorButtonImageOptions1.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.[True] + EditorButtonImageOptions1.SvgImage = CType(resources.GetObject("EditorButtonImageOptions1.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.RepositoryItemRibbonSearchEdit2.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, True, True, True, EditorButtonImageOptions1, New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), SerializableAppearanceObject1, SerializableAppearanceObject2, SerializableAppearanceObject3, SerializableAppearanceObject4, "", Nothing, Nothing, DevExpress.Utils.ToolTipAnchor.[Default]), New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Clear, "", -1, True, False, False, EditorButtonImageOptions2, New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), SerializableAppearanceObject5, SerializableAppearanceObject6, SerializableAppearanceObject7, SerializableAppearanceObject8, "", Nothing, Nothing, DevExpress.Utils.ToolTipAnchor.[Default])}) Me.RepositoryItemRibbonSearchEdit2.Name = "RepositoryItemRibbonSearchEdit2" Me.RepositoryItemRibbonSearchEdit2.NullText = "Search" ' @@ -128,10 +128,10 @@ Partial Class frmSQLEditor Me.LayoutControl1.Controls.Add(Me.DropDownButton3) Me.LayoutControl1.Controls.Add(Me.cmbConnections) 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.Root = Me.Root - Me.LayoutControl1.Size = New System.Drawing.Size(1283, 605) + Me.LayoutControl1.Size = New System.Drawing.Size(1283, 604) Me.LayoutControl1.TabIndex = 0 Me.LayoutControl1.Text = "LayoutControl1" ' @@ -142,7 +142,7 @@ Partial Class frmSQLEditor Me.GridControlPlaceholders.MainView = Me.GridViewPlaceholder Me.GridControlPlaceholders.MenuManager = Me.RibbonControl1 Me.GridControlPlaceholders.Name = "GridControlPlaceholders" - Me.GridControlPlaceholders.Size = New System.Drawing.Size(417, 246) + Me.GridControlPlaceholders.Size = New System.Drawing.Size(417, 245) Me.GridControlPlaceholders.TabIndex = 7 Me.GridControlPlaceholders.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewPlaceholder}) ' @@ -178,7 +178,7 @@ Partial Class frmSQLEditor Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide Me.RibbonControl1.ShowToolbarCustomizeItem = False - Me.RibbonControl1.Size = New System.Drawing.Size(1283, 63) + Me.RibbonControl1.Size = New System.Drawing.Size(1283, 66) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 Me.RibbonControl1.Toolbar.ShowCustomizeItem = False ' @@ -250,10 +250,10 @@ Partial Class frmSQLEditor Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticItem1) Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticItem2) Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticItem3) - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 668) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 670) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(1283, 24) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1283, 22) ' 'GridControlResult ' @@ -261,7 +261,7 @@ Partial Class frmSQLEditor Me.GridControlResult.MainView = Me.GridViewResult Me.GridControlResult.MenuManager = Me.RibbonControl1 Me.GridControlResult.Name = "GridControlResult" - Me.GridControlResult.Size = New System.Drawing.Size(838, 246) + Me.GridControlResult.Size = New System.Drawing.Size(838, 245) Me.GridControlResult.TabIndex = 5 Me.GridControlResult.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewResult}) ' @@ -345,10 +345,10 @@ Partial Class frmSQLEditor ' 'RibbonStatusBar11 ' - Me.RibbonStatusBar11.Location = New System.Drawing.Point(0, 752) + Me.RibbonStatusBar11.Location = New System.Drawing.Point(0, 757) Me.RibbonStatusBar11.Name = "RibbonStatusBar11" Me.RibbonStatusBar11.Ribbon = Me.RibbonControl11 - Me.RibbonStatusBar11.Size = New System.Drawing.Size(1283, 27) + Me.RibbonStatusBar11.Size = New System.Drawing.Size(1283, 22) ' 'DropDownButton2 ' @@ -386,7 +386,7 @@ Partial Class frmSQLEditor Me.Root.GroupBordersVisible = False Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem3, Me.LayoutControlItem2, Me.LayoutControlItem4, Me.SimpleLabelItem2, Me.LayoutControlItem1, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.LayoutControlItem7, Me.LayoutControlItem8, Me.SimpleSeparator1, Me.SimpleLabelItem1, Me.SimpleSeparator2}) Me.Root.Name = "Root" - Me.Root.Size = New System.Drawing.Size(1283, 605) + Me.Root.Size = New System.Drawing.Size(1283, 604) Me.Root.TextVisible = False ' 'LayoutControlItem3 @@ -400,14 +400,14 @@ Partial Class frmSQLEditor Me.LayoutControlItem3.Size = New System.Drawing.Size(421, 59) Me.LayoutControlItem3.Text = "SQL Verbindung" Me.LayoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top - Me.LayoutControlItem3.TextSize = New System.Drawing.Size(97, 16) + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(105, 16) ' 'LayoutControlItem2 ' Me.LayoutControlItem2.Control = Me.GridControlResult Me.LayoutControlItem2.Location = New System.Drawing.Point(421, 335) Me.LayoutControlItem2.Name = "LayoutControlItem2" - Me.LayoutControlItem2.Size = New System.Drawing.Size(842, 250) + Me.LayoutControlItem2.Size = New System.Drawing.Size(842, 249) Me.LayoutControlItem2.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem2.TextVisible = False ' @@ -416,7 +416,7 @@ Partial Class frmSQLEditor Me.LayoutControlItem4.Control = Me.GridControlPlaceholders Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 335) Me.LayoutControlItem4.Name = "LayoutControlItem4" - Me.LayoutControlItem4.Size = New System.Drawing.Size(421, 250) + Me.LayoutControlItem4.Size = New System.Drawing.Size(421, 249) Me.LayoutControlItem4.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem4.TextVisible = False ' @@ -430,7 +430,7 @@ Partial Class frmSQLEditor Me.SimpleLabelItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.SimpleLabelItem2.Size = New System.Drawing.Size(842, 36) Me.SimpleLabelItem2.Text = "Ergebnis" - Me.SimpleLabelItem2.TextSize = New System.Drawing.Size(97, 16) + Me.SimpleLabelItem2.TextSize = New System.Drawing.Size(105, 16) ' 'LayoutControlItem1 ' @@ -443,7 +443,7 @@ Partial Class frmSQLEditor Me.LayoutControlItem1.Size = New System.Drawing.Size(1263, 238) Me.LayoutControlItem1.Text = "SQL Abfrage" Me.LayoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top - Me.LayoutControlItem1.TextSize = New System.Drawing.Size(97, 16) + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(105, 16) ' 'LayoutControlItem5 ' @@ -501,7 +501,7 @@ Partial Class frmSQLEditor Me.SimpleLabelItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.SimpleLabelItem1.Size = New System.Drawing.Size(421, 36) Me.SimpleLabelItem1.Text = "Platzhalter" - Me.SimpleLabelItem1.TextSize = New System.Drawing.Size(97, 16) + Me.SimpleLabelItem1.TextSize = New System.Drawing.Size(105, 16) ' 'SimpleSeparator2 ' diff --git a/Controls.SQLEditor/frmSQLEditor.resx b/Controls.SQLEditor/frmSQLEditor.resx index a5a8d34e..f53ea551 100644 --- a/Controls.SQLEditor/frmSQLEditor.resx +++ b/Controls.SQLEditor/frmSQLEditor.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl diff --git a/Controls.SQLEditor/frmSQLEditor.vb b/Controls.SQLEditor/frmSQLEditor.vb index c48c20c7..fb2b9c13 100644 --- a/Controls.SQLEditor/frmSQLEditor.vb +++ b/Controls.SQLEditor/frmSQLEditor.vb @@ -12,17 +12,17 @@ Public Class frmSQLEditor Private SQLServer As MSSQLServer Private CurrentPosition As String - Private Placeholders As New List(Of SqlPlaceholder) - Private Connections As New List(Of SqlConnection) + Private Placeholders As New List(Of Placeholder) + Private Connections As New List(Of Connection) Private Patterns As ClassPatterns - Friend Class SqlPlaceholder + Friend Class Placeholder Public Property Placeholder As String Public Property Replacement As String End Class - Friend Class SqlConnection + Friend Class Connection Public Property Guid As Integer Public Property Name As String Public Property Description As String @@ -74,10 +74,10 @@ Public Class frmSQLEditor Try Dim oSQL As String = "SELECT * FROM TBDD_CONNECTION" Dim oTable As DataTable = SQLServer.GetDatatable(oSQL) - Dim oConnections As New List(Of SqlConnection) + Dim oConnections As New List(Of Connection) For Each oRow As DataRow In oTable.Rows - oConnections.Add(New SqlConnection With { + oConnections.Add(New Connection With { .Guid = NotNull(oRow.Item("GUID"), String.Empty), .Name = NotNull(oRow.Item("BEZEICHNUNG"), String.Empty), .Provider = NotNull(oRow.Item("SQL_PROVIDER"), String.Empty), @@ -92,7 +92,7 @@ Public Class frmSQLEditor Return oConnections Catch ex As Exception ShowErrorMessage(ex) - Return New List(Of SqlConnection) + Return New List(Of Connection) End Try End Function @@ -110,7 +110,7 @@ Public Class frmSQLEditor Try Dim oSQL As String = txtSQL.EditValue.ToString - Dim oConnection As SqlConnection = cmbConnections.SelectedItem + Dim oConnection As Connection = cmbConnections.SelectedItem Dim oConnectionString = SQLServer.GetConnectionString(oConnection.Server, oConnection.Database, oConnection.Username, oConnection.Password) Dim oTable As DataTable = SQLServer.GetDatatableWithConnection(oSQL, oConnectionString) @@ -136,7 +136,7 @@ Public Class frmSQLEditor Placeholders.Clear() For Each oPattern In Patterns.GetAllPatterns(Text) - Placeholders.Add(New SqlPlaceholder With { + Placeholders.Add(New Placeholder With { .Placeholder = oPattern.ToString, .Replacement = "" }) From cbd861fc8996669746f6afc72475be2d163ae1ff Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 29 Apr 2021 16:09:27 +0200 Subject: [PATCH 62/82] TestGUI: Add Localizer Tests for LookupControl --- GUIs.Test.TestGUI/frmLookup.vb | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/GUIs.Test.TestGUI/frmLookup.vb b/GUIs.Test.TestGUI/frmLookup.vb index 9614ea06..7a1a3257 100644 --- a/GUIs.Test.TestGUI/frmLookup.vb +++ b/GUIs.Test.TestGUI/frmLookup.vb @@ -1,10 +1,23 @@ -Imports DigitalData.Controls.LookupGrid +Imports System.Globalization +Imports DevExpress.XtraEditors.Controls +Imports DigitalData.Controls.LookupGrid Public Class frmLookup Private _Datasource As List(Of String) = New List(Of String) From {"Foo", "Bar", "Baz", "Bart", "Maggie", "Homer"} + Public Sub New() + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + Localizer.Active = New LookupGridLocalizer() + End Sub + Private Sub frmLookup_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Dim oCulture = CultureInfo.CurrentCulture + Dim oUICulture = CultureInfo.CurrentUICulture + Dim oTable = GetDatatable(10) Dim LookupControl31 As New LookupControl3 With { From 47893a44c68d63ba2fe6426197ff50bcc33482be Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 29 Apr 2021 16:09:49 +0200 Subject: [PATCH 63/82] ZooFlow: Administration --- GUIs.ZooFlow/Administration/ClassConstants.vb | 2 + .../Administration/ClassDetailForm.vb | 2 +- .../Administration/ClassDetailPage.vb | 178 +- GUIs.ZooFlow/Administration/IAdminForm.vb | 1 - ... => frmAdmin_ClipboardWatcher.Designer.vb} | 727 ++++++- ...le.resx => frmAdmin_ClipboardWatcher.resx} | 21 + ...rofile.vb => frmAdmin_ClipboardWatcher.vb} | 130 +- GUIs.ZooFlow/Administration/frmAdmin_Start.vb | 1 - GUIs.ZooFlow/DBCW_Stammdaten.Designer.vb | 957 ++++++++- GUIs.ZooFlow/DBCW_Stammdaten.xsd | 76 +- GUIs.ZooFlow/DBCW_Stammdaten.xss | 24 +- GUIs.ZooFlow/DSDD_Stammdaten.Designer.vb | 1835 +++++++++++++++++ GUIs.ZooFlow/DSDD_Stammdaten.xsc | 9 + GUIs.ZooFlow/DSDD_Stammdaten.xsd | 207 ++ GUIs.ZooFlow/DSDD_Stammdaten.xss | 12 + GUIs.ZooFlow/ZooFlow.vbproj | 26 +- 16 files changed, 3905 insertions(+), 303 deletions(-) rename GUIs.ZooFlow/Administration/{frmAdmin_CWProfile.Designer.vb => frmAdmin_ClipboardWatcher.Designer.vb} (61%) rename GUIs.ZooFlow/Administration/{frmAdmin_CWProfile.resx => frmAdmin_ClipboardWatcher.resx} (83%) rename GUIs.ZooFlow/Administration/{frmAdmin_CWProfile.vb => frmAdmin_ClipboardWatcher.vb} (66%) create mode 100644 GUIs.ZooFlow/DSDD_Stammdaten.Designer.vb create mode 100644 GUIs.ZooFlow/DSDD_Stammdaten.xsc create mode 100644 GUIs.ZooFlow/DSDD_Stammdaten.xsd create mode 100644 GUIs.ZooFlow/DSDD_Stammdaten.xss diff --git a/GUIs.ZooFlow/Administration/ClassConstants.vb b/GUIs.ZooFlow/Administration/ClassConstants.vb index 584dca54..d6498a98 100644 --- a/GUIs.ZooFlow/Administration/ClassConstants.vb +++ b/GUIs.ZooFlow/Administration/ClassConstants.vb @@ -15,5 +15,7 @@ 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 index 47cdb5f0..44595a9a 100644 --- a/GUIs.ZooFlow/Administration/ClassDetailForm.vb +++ b/GUIs.ZooFlow/Administration/ClassDetailForm.vb @@ -114,7 +114,7 @@ Public Class ClassDetailForm Private Sub Load_CWProfile(PrimaryKey As Integer, IsInsert As Boolean) Try - Dim oForm As New frmAdmin_CWProfile(PrimaryKey) With {.IsInsert = IsInsert} + Dim oForm As New frmAdmin_ClipboardWatcher(PrimaryKey) With {.IsInsert = IsInsert} oForm.ShowDialog() RaiseEvent DetailFormClosed(Me, oForm) diff --git a/GUIs.ZooFlow/Administration/ClassDetailPage.vb b/GUIs.ZooFlow/Administration/ClassDetailPage.vb index 9f085088..1f5bb314 100644 --- a/GUIs.ZooFlow/Administration/ClassDetailPage.vb +++ b/GUIs.ZooFlow/Administration/ClassDetailPage.vb @@ -1,15 +1,37 @@ Imports System.ComponentModel Imports DevExpress.XtraEditors +Imports DevExpress.XtraEditors.Controls Imports DevExpress.XtraLayout Imports DevExpress.XtraTab Imports DigitalData.Modules.Language.Utils +Imports DigitalData.Modules.Logging +''' +''' +''' Public Class ClassDetailPages + Private ReadOnly LogConfig As LogConfig + Private ReadOnly Logger As Logger + Private ReadOnly HostForm As IAdminForm + Public Items As New Dictionary(Of String, DetailPage) - Public CurrentPage As DetailPage Public Event AnyControl_Focus As EventHandler(Of DetailPageEventArgs) Public Event AnyControl_Changed As EventHandler(Of DetailPageEventArgs) + Public Event CurrentPage_Changed As EventHandler(Of DetailPageEventArgs) + + Private CurrentPage As DetailPage + + Public Property Current As DetailPage + Get + Return CurrentPage + End Get + Set(value As DetailPage) + CurrentPage = value + + RaiseEvent CurrentPage_Changed(Me, New DetailPageEventArgs With {.Page = CurrentPage}) + End Set + End Property Public Class DetailPageEventArgs Public Property Page As DetailPage @@ -17,6 +39,7 @@ Public Class ClassDetailPages Public Class DetailPage Public IsPrimary As Boolean = False + Public IsInsert As Boolean = False Public TabPage As XtraTabPage Public Name As String Public BindingSource As BindingSource @@ -25,7 +48,32 @@ Public Class ClassDetailPages Public ChangedWhoEdit As TextEdit End Class - Public Sub New(LayoutControls As List(Of LayoutControl)) + ''' + ''' Detail page which represents the primary page of a form + ''' + Public Class PrimaryPage + Inherits DetailPage + + Public Sub New(Insert As Boolean) + IsInsert = Insert + IsPrimary = True + End Sub + End Class + + Public Class ComboBoxItem + Public Property Text + Public Property Value + + Public Overrides Function ToString() As String + Return Text + End Function + End Class + + Public Sub New(LogConfig As LogConfig, Form As IAdminForm, LayoutControls As List(Of LayoutControl)) + Me.LogConfig = LogConfig + Logger = LogConfig.GetLogger() + HostForm = Form + For Each oLayoutControl In LayoutControls AddHandler oLayoutControl.Click, AddressOf Handle_Focus AddHandler oLayoutControl.GotFocus, AddressOf Handle_Focus @@ -39,21 +87,110 @@ Public Class ClassDetailPages Next End Sub + ''' + ''' Add a new DetailPage or a new PrimaryPage + ''' Public Sub Add(Page As DetailPage) Items.Add(Page.TabPage.Name, Page) + + AddHandler Page.BindingSource.AddingNew, Sub(sender As Object, e As EventArgs) + Page.AddedWhoEdit.EditValue = Environment.UserName + End Sub End Sub + ''' + ''' Add a list of new DetailPages or new PrimaryPages + ''' Public Sub AddRange(ParamArray Pages As DetailPage()) For Each oPage In Pages Add(oPage) Next End Sub - Private Sub Handle_Validating(sender As Object, e As CancelEventArgs) + ''' + ''' Get the DetailPage which uses the given `TabPage` + ''' + Public Function GetDetailPage(TabPage As XtraTabPage) As DetailPage + Try + Dim oItem = Items. + Where(Function(Item) TabPage.Equals(Item.Value.TabPage)). + FirstOrDefault() + + Return oItem.Value + Catch ex As Exception + Return Nothing + End Try + End Function + + ''' + ''' Saves the pending changes to the binding source + ''' + ''' True, if changes were made, otherwise False + Public Function PrepareSave() As Boolean + Dim oPage = CurrentPage + + If oPage Is Nothing Then + Return False + End If + + Try + oPage.BindingSource.EndEdit() + + If oPage.DataTable.GetChanges() IsNot Nothing Then + If oPage.IsInsert Then + oPage.AddedWhoEdit.EditValue = My.Application.User.UserName + Else + oPage.ChangedWhoEdit.EditValue = My.Application.User.UserName + End If + + oPage.BindingSource.EndEdit() + Return True + Else + Return False + End If + Catch ex As Exception + Logger.Error(ex) + Return False + End Try + End Function + + Private Sub Handle_Validating(sender As Object, e As BaseEditValidatingEventArgs) Dim oControl As BaseEdit = sender - Dim oBinding As Binding = oControl.DataBindings.Item("EditValue") + Dim oColumn As DataColumn = Get_DataColumnFromBaseEdit(oControl) - If TypeOf oBinding.DataSource Is BindingSource Then + If oColumn IsNot Nothing Then + Dim oNullable As Boolean = oColumn.AllowDBNull + + If oNullable = False Then + If TypeOf oControl Is ComboBoxEdit AndAlso DirectCast(oControl, ComboBoxEdit).SelectedIndex = -1 Then + e.ErrorText = "Please select a value from the list." + e.Cancel = True + + ElseIf NotNull(oControl.EditValue.ToString, String.Empty) = String.Empty Then + e.ErrorText = "Please input a value" + e.Cancel = True + + End If + End If + End If + End Sub + + Private Function Get_DataColumnFromBaseEdit(Control As BaseEdit) As DataColumn + Dim oBinding As Binding = Control.DataBindings.Item("EditValue") + + If Control.DataBindings.Count = 0 OrElse oBinding Is Nothing Then + Return Nothing + End If + + If oBinding.DataSource Is Nothing Then + Return Nothing + End If + + If TypeOf oBinding.DataSource IsNot BindingSource Then + Return Nothing + End If + + Try Dim oSource As BindingSource = oBinding.DataSource Dim oTableName As String = oSource.DataMember Dim oDataSet As DataSet = oSource.DataSource @@ -61,15 +198,12 @@ Public Class ClassDetailPages Dim oColumnName As String = oBinding.BindingMemberInfo.BindingField Dim oColumn As DataColumn = oTable.Columns.Item(oColumnName) - Dim oNullable As Boolean = oColumn.AllowDBNull - - If oNullable = False And NotNull(oControl.EditValue.ToString, String.Empty) = String.Empty Then - Throw New NoNullAllowedException() - End If - End If - - Console.WriteLine() - End Sub + Return oColumn + Catch ex As Exception + Logger.Error(ex) + Return Nothing + End Try + End Function Private Sub Handle_Focus(sender As Control, e As EventArgs) Dim oControl As Control = sender @@ -86,22 +220,20 @@ Public Class ClassDetailPages Exit Sub End If - ' Get the TabPage containing the Layout Control - Do_Handle_Focus(oLayoutControl, oControl) - End Sub - - Private Sub Do_Handle_Focus(LayoutControl As LayoutControl, Control As Control) - If TypeOf LayoutControl.Parent Is XtraTabPage Then - Dim oTabPage As XtraTabPage = LayoutControl.Parent + If TypeOf oLayoutControl.Parent Is XtraTabPage Then + Dim oTabPage As XtraTabPage = oLayoutControl.Parent If Items.ContainsKey(oTabPage.Name) Then CurrentPage = Items.Item(oTabPage.Name) Dim oData As New DetailPageEventArgs With {.Page = Items.Item(oTabPage.Name)} - RaiseEvent AnyControl_Focus(Control, oData) + RaiseEvent CurrentPage_Changed(Me, oData) + RaiseEvent AnyControl_Focus(oControl, oData) Else CurrentPage = Nothing - RaiseEvent AnyControl_Focus(Control, Nothing) + + RaiseEvent CurrentPage_Changed(Me, Nothing) + RaiseEvent AnyControl_Focus(oControl, Nothing) End If End If End Sub diff --git a/GUIs.ZooFlow/Administration/IAdminForm.vb b/GUIs.ZooFlow/Administration/IAdminForm.vb index 5c6e32a3..e3eca4d6 100644 --- a/GUIs.ZooFlow/Administration/IAdminForm.vb +++ b/GUIs.ZooFlow/Administration/IAdminForm.vb @@ -3,6 +3,5 @@ Property HasChanges As Boolean Property IsInsert As Boolean - Function SaveData() As Boolean Function DeleteData() As Boolean End Interface diff --git a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_ClipboardWatcher.Designer.vb similarity index 61% rename from GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb rename to GUIs.ZooFlow/Administration/frmAdmin_ClipboardWatcher.Designer.vb index bf811918..ffc2e946 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_ClipboardWatcher.Designer.vb @@ -1,7 +1,7 @@ Imports DigitalData.GUIs.Common.Base -Partial Class frmAdmin_CWProfile +Partial Class frmAdmin_ClipboardWatcher Inherits BaseRibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. @@ -40,6 +40,16 @@ Partial Class frmAdmin_CWProfile Dim SerializableAppearanceObject10 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() Dim SerializableAppearanceObject11 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() Dim SerializableAppearanceObject12 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim EditorButtonImageOptions4 As DevExpress.XtraEditors.Controls.EditorButtonImageOptions = New DevExpress.XtraEditors.Controls.EditorButtonImageOptions() + Dim SerializableAppearanceObject13 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject14 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject15 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject16 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim EditorButtonImageOptions5 As DevExpress.XtraEditors.Controls.EditorButtonImageOptions = New DevExpress.XtraEditors.Controls.EditorButtonImageOptions() + Dim SerializableAppearanceObject17 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject18 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject19 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject20 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.BarButtonSave = New DevExpress.XtraBars.BarButtonItem() Me.labelStatus = New DevExpress.XtraBars.BarStaticItem() @@ -64,6 +74,8 @@ Partial Class frmAdmin_CWProfile Me.txtChangedWhen = New DevExpress.XtraEditors.TextEdit() Me.CheckEdit1 = New DevExpress.XtraEditors.CheckEdit() Me.TextEdit4 = New DevExpress.XtraEditors.ButtonEdit() + Me.cmbProfileType = New DevExpress.XtraEditors.LookUpEdit() + Me.TBLOCAL_PROFILE_TYPEBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() @@ -74,6 +86,7 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem9 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem20 = New DevExpress.XtraLayout.LayoutControlItem() Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() Me.PageProfile = New DevExpress.XtraTab.XtraTabPage() Me.XtraTabControl2 = New DevExpress.XtraTab.XtraTabControl() @@ -83,13 +96,17 @@ Partial Class frmAdmin_CWProfile Me.TBCW_PROF_DOC_SEARCHBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TextEdit6 = New DevExpress.XtraEditors.TextEdit() Me.CheckEdit2 = New DevExpress.XtraEditors.CheckEdit() - Me.ComboBoxEdit1 = New DevExpress.XtraEditors.ComboBoxEdit() Me.TextEdit7 = New DevExpress.XtraEditors.ButtonEdit() Me.TextEdit8 = New DevExpress.XtraEditors.ButtonEdit() Me.txtAddedWho1 = New DevExpress.XtraEditors.TextEdit() Me.txtChangedWho1 = New DevExpress.XtraEditors.TextEdit() Me.txtAddedWhen1 = New DevExpress.XtraEditors.TextEdit() Me.txtChangedWhen1 = New DevExpress.XtraEditors.TextEdit() + Me.cmbSearchPositions = New DevExpress.XtraEditors.LookUpEdit() + Me.TBLOCAL_SEARCH_POSITIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.ComboBoxEdit1 = New DevExpress.XtraEditors.LookUpEdit() + Me.TBDD_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.DSDD_Stammdaten = New DigitalData.GUIs.ZooFlow.DSDD_Stammdaten() Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup() Me.LayoutControlItem10 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem11 = New DevExpress.XtraLayout.LayoutControlItem() @@ -101,19 +118,44 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem17 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem18 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem19 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem21 = New DevExpress.XtraLayout.LayoutControlItem() Me.GridControl2 = New DevExpress.XtraGrid.GridControl() Me.GridViewDocSearch = New DevExpress.XtraGrid.Views.Grid.GridView() Me.colTAB_TITLE1 = New DevExpress.XtraGrid.Columns.GridColumn() Me.PageDataSearch = New DevExpress.XtraTab.XtraTabPage() Me.LayoutControlDataSearch = New DevExpress.XtraLayout.LayoutControl() + Me.TextEdit51 = New DevExpress.XtraEditors.TextEdit() + Me.TBCW_PROF_DATA_SEARCHBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.TextEdit61 = New DevExpress.XtraEditors.TextEdit() + Me.cmbSearchPositions1 = New DevExpress.XtraEditors.LookUpEdit() + Me.CheckEdit21 = New DevExpress.XtraEditors.CheckEdit() + Me.TextEdit71 = New DevExpress.XtraEditors.ButtonEdit() + Me.TextEdit81 = New DevExpress.XtraEditors.ButtonEdit() + Me.txtAddedWho11 = New DevExpress.XtraEditors.TextEdit() + Me.txtChangedWho11 = New DevExpress.XtraEditors.TextEdit() + Me.txtAddedWhen11 = New DevExpress.XtraEditors.TextEdit() + Me.txtChangedWhen11 = New DevExpress.XtraEditors.TextEdit() + Me.ComboBoxEdit11 = New DevExpress.XtraEditors.LookUpEdit() Me.LayoutControlGroup2 = New DevExpress.XtraLayout.LayoutControlGroup() + Me.LayoutControlItem22 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem23 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem26 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem27 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem32 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem28 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem29 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem30 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem31 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem24 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem25 = New DevExpress.XtraLayout.LayoutControlItem() Me.GridControl1 = New DevExpress.XtraGrid.GridControl() - Me.TBCW_PROF_DATA_SEARCHBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.GridViewDataSearch = New DevExpress.XtraGrid.Views.Grid.GridView() Me.colTAB_TITLE = New DevExpress.XtraGrid.Columns.GridColumn() Me.PageApplicationAssignment = New DevExpress.XtraTab.XtraTabPage() Me.TBCW_PROF_DOC_SEARCHTableAdapter = New DigitalData.GUIs.ZooFlow.DBCW_StammdatenTableAdapters.TBCW_PROF_DOC_SEARCHTableAdapter() Me.TBCW_PROF_DATA_SEARCHTableAdapter = New DigitalData.GUIs.ZooFlow.DBCW_StammdatenTableAdapters.TBCW_PROF_DATA_SEARCHTableAdapter() + Me.TBDD_CONNECTIONTableAdapter = New DigitalData.GUIs.ZooFlow.DSDD_StammdatenTableAdapters.TBDD_CONNECTIONTableAdapter() + Me.TableAdapterManager1 = New DigitalData.GUIs.ZooFlow.DSDD_StammdatenTableAdapters.TableAdapterManager() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DBCW_Stammdaten, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBCW_PROFILESBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() @@ -128,6 +170,8 @@ Partial Class frmAdmin_CWProfile CType(Me.txtChangedWhen.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.CheckEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit4.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.cmbProfileType.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TBLOCAL_PROFILE_TYPEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() @@ -138,6 +182,7 @@ Partial Class frmAdmin_CWProfile CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem20, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl1.SuspendLayout() Me.PageProfile.SuspendLayout() @@ -150,13 +195,17 @@ Partial Class frmAdmin_CWProfile CType(Me.TBCW_PROF_DOC_SEARCHBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit6.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.CheckEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit7.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit8.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtAddedWho1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtChangedWho1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtAddedWhen1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtChangedWhen1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.cmbSearchPositions.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TBLOCAL_SEARCH_POSITIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.DSDD_Stammdaten, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).BeginInit() @@ -168,13 +217,37 @@ Partial Class frmAdmin_CWProfile CType(Me.LayoutControlItem17, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem18, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem19, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem21, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridViewDocSearch, System.ComponentModel.ISupportInitialize).BeginInit() Me.PageDataSearch.SuspendLayout() CType(Me.LayoutControlDataSearch, System.ComponentModel.ISupportInitialize).BeginInit() + Me.LayoutControlDataSearch.SuspendLayout() + CType(Me.TextEdit51.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TBCW_PROF_DATA_SEARCHBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextEdit61.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.cmbSearchPositions1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.CheckEdit21.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextEdit71.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextEdit81.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtAddedWho11.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtChangedWho11.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtAddedWhen11.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtChangedWhen11.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ComboBoxEdit11.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem22, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem23, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem26, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem27, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem32, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem28, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem29, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem30, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem31, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem24, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem25, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TBCW_PROF_DATA_SEARCHBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridViewDataSearch, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -189,7 +262,7 @@ Partial Class frmAdmin_CWProfile Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide Me.RibbonControl1.ShowToolbarCustomizeItem = False - Me.RibbonControl1.Size = New System.Drawing.Size(1328, 132) + Me.RibbonControl1.Size = New System.Drawing.Size(1328, 131) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 Me.RibbonControl1.Toolbar.ShowCustomizeItem = False ' @@ -249,10 +322,10 @@ Partial Class frmAdmin_CWProfile ' Me.RibbonStatusBar1.ItemLinks.Add(Me.labelStatus) Me.RibbonStatusBar1.ItemLinks.Add(Me.labelError) - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 674) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 676) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(1328, 24) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1328, 22) ' 'RibbonPage2 ' @@ -292,86 +365,88 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlProfile.Controls.Add(Me.txtChangedWhen) Me.LayoutControlProfile.Controls.Add(Me.CheckEdit1) Me.LayoutControlProfile.Controls.Add(Me.TextEdit4) + Me.LayoutControlProfile.Controls.Add(Me.cmbProfileType) Me.LayoutControlProfile.Dock = System.Windows.Forms.DockStyle.Top Me.LayoutControlProfile.Location = New System.Drawing.Point(0, 0) Me.LayoutControlProfile.Name = "LayoutControlProfile" Me.LayoutControlProfile.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(848, 159, 650, 400) Me.LayoutControlProfile.Root = Me.Root - Me.LayoutControlProfile.Size = New System.Drawing.Size(1326, 252) + Me.LayoutControlProfile.Size = New System.Drawing.Size(1326, 246) Me.LayoutControlProfile.TabIndex = 2 Me.LayoutControlProfile.Text = "LayoutControl1" ' 'TextEdit1 ' Me.TextEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "GUID", True)) - Me.TextEdit1.Location = New System.Drawing.Point(110, 15) + Me.TextEdit1.Location = New System.Drawing.Point(116, 15) Me.TextEdit1.MenuManager = Me.RibbonControl1 Me.TextEdit1.Name = "TextEdit1" - Me.TextEdit1.Size = New System.Drawing.Size(546, 20) + Me.TextEdit1.Properties.ReadOnly = True + Me.TextEdit1.Size = New System.Drawing.Size(540, 20) Me.TextEdit1.StyleController = Me.LayoutControlProfile Me.TextEdit1.TabIndex = 4 ' 'TextEdit2 ' Me.TextEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "NAME", True)) - Me.TextEdit2.Location = New System.Drawing.Point(110, 45) + Me.TextEdit2.Location = New System.Drawing.Point(116, 45) Me.TextEdit2.MenuManager = Me.RibbonControl1 Me.TextEdit2.Name = "TextEdit2" - Me.TextEdit2.Size = New System.Drawing.Size(1201, 20) + Me.TextEdit2.Size = New System.Drawing.Size(540, 20) Me.TextEdit2.StyleController = Me.LayoutControlProfile Me.TextEdit2.TabIndex = 5 ' 'TextEdit3 ' Me.TextEdit3.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "COMMENT", True)) - Me.TextEdit3.Location = New System.Drawing.Point(110, 75) + Me.TextEdit3.Location = New System.Drawing.Point(116, 75) Me.TextEdit3.MenuManager = Me.RibbonControl1 Me.TextEdit3.Name = "TextEdit3" - Me.TextEdit3.Size = New System.Drawing.Size(1201, 20) + Me.TextEdit3.Size = New System.Drawing.Size(1195, 20) Me.TextEdit3.StyleController = Me.LayoutControlProfile Me.TextEdit3.TabIndex = 6 ' 'txtAddedWho ' Me.txtAddedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "ADDED_WHO", True)) - Me.txtAddedWho.Location = New System.Drawing.Point(110, 139) + Me.txtAddedWho.Location = New System.Drawing.Point(116, 139) Me.txtAddedWho.MenuManager = Me.RibbonControl1 Me.txtAddedWho.Name = "txtAddedWho" Me.txtAddedWho.Properties.ReadOnly = True - Me.txtAddedWho.Size = New System.Drawing.Size(546, 20) + Me.txtAddedWho.Size = New System.Drawing.Size(540, 20) Me.txtAddedWho.StyleController = Me.LayoutControlProfile Me.txtAddedWho.TabIndex = 7 ' 'txtAddedWhen ' Me.txtAddedWhen.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "CHANGED_WHO", True)) - Me.txtAddedWhen.Location = New System.Drawing.Point(761, 139) + Me.txtAddedWhen.Location = New System.Drawing.Point(767, 139) Me.txtAddedWhen.MenuManager = Me.RibbonControl1 Me.txtAddedWhen.Name = "txtAddedWhen" Me.txtAddedWhen.Properties.ReadOnly = True - Me.txtAddedWhen.Size = New System.Drawing.Size(550, 20) + Me.txtAddedWhen.Size = New System.Drawing.Size(544, 20) Me.txtAddedWhen.StyleController = Me.LayoutControlProfile Me.txtAddedWhen.TabIndex = 8 ' 'txtChangedWho ' Me.txtChangedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "ADDED_WHEN", True)) - Me.txtChangedWho.Location = New System.Drawing.Point(110, 169) + Me.txtChangedWho.Location = New System.Drawing.Point(116, 169) Me.txtChangedWho.MenuManager = Me.RibbonControl1 Me.txtChangedWho.Name = "txtChangedWho" Me.txtChangedWho.Properties.ReadOnly = True - Me.txtChangedWho.Size = New System.Drawing.Size(546, 20) + Me.txtChangedWho.Size = New System.Drawing.Size(540, 20) Me.txtChangedWho.StyleController = Me.LayoutControlProfile Me.txtChangedWho.TabIndex = 9 ' 'txtChangedWhen ' Me.txtChangedWhen.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "CHANGED_WHEN", True)) - Me.txtChangedWhen.Location = New System.Drawing.Point(761, 169) + Me.txtChangedWhen.Location = New System.Drawing.Point(767, 169) Me.txtChangedWhen.MenuManager = Me.RibbonControl1 Me.txtChangedWhen.Name = "txtChangedWhen" Me.txtChangedWhen.Properties.ReadOnly = True - Me.txtChangedWhen.Size = New System.Drawing.Size(550, 20) + Me.txtChangedWhen.Size = New System.Drawing.Size(544, 20) Me.txtChangedWhen.StyleController = Me.LayoutControlProfile Me.txtChangedWhen.TabIndex = 10 ' @@ -382,30 +457,52 @@ Partial Class frmAdmin_CWProfile Me.CheckEdit1.MenuManager = Me.RibbonControl1 Me.CheckEdit1.Name = "CheckEdit1" Me.CheckEdit1.Properties.Caption = "Aktiv" - Me.CheckEdit1.Size = New System.Drawing.Size(645, 20) + Me.CheckEdit1.Size = New System.Drawing.Size(645, 18) Me.CheckEdit1.StyleController = Me.LayoutControlProfile Me.CheckEdit1.TabIndex = 11 ' 'TextEdit4 ' Me.TextEdit4.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "REGEX_EXPRESSION", True)) - Me.TextEdit4.Location = New System.Drawing.Point(110, 105) + Me.TextEdit4.Location = New System.Drawing.Point(116, 105) Me.TextEdit4.MenuManager = Me.RibbonControl1 Me.TextEdit4.Name = "TextEdit4" EditorButtonImageOptions1.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.definednameuseinformula3 EditorButtonImageOptions1.SvgImageSize = New System.Drawing.Size(16, 16) Me.TextEdit4.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "Regex bearbeiten", 50, True, True, False, EditorButtonImageOptions1, New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), SerializableAppearanceObject1, SerializableAppearanceObject2, SerializableAppearanceObject3, SerializableAppearanceObject4, "", "BUTTON_REGEX_PROFILE", Nothing, DevExpress.Utils.ToolTipAnchor.[Default])}) - Me.TextEdit4.Size = New System.Drawing.Size(1201, 24) + Me.TextEdit4.Size = New System.Drawing.Size(1195, 24) Me.TextEdit4.StyleController = Me.LayoutControlProfile Me.TextEdit4.TabIndex = 12 ' + 'cmbProfileType + ' + Me.cmbProfileType.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "PROFILE_TYPE", True)) + Me.cmbProfileType.Location = New System.Drawing.Point(767, 45) + Me.cmbProfileType.MenuManager = Me.RibbonControl1 + Me.cmbProfileType.Name = "cmbProfileType" + Me.cmbProfileType.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.cmbProfileType.Properties.Columns.AddRange(New DevExpress.XtraEditors.Controls.LookUpColumnInfo() {New DevExpress.XtraEditors.Controls.LookUpColumnInfo("NAME", "Name")}) + Me.cmbProfileType.Properties.DataSource = Me.TBLOCAL_PROFILE_TYPEBindingSource + Me.cmbProfileType.Properties.DisplayMember = "NAME" + Me.cmbProfileType.Properties.NullText = "" + Me.cmbProfileType.Properties.PopupSizeable = False + Me.cmbProfileType.Properties.ValueMember = "ID" + Me.cmbProfileType.Size = New System.Drawing.Size(544, 20) + Me.cmbProfileType.StyleController = Me.LayoutControlProfile + Me.cmbProfileType.TabIndex = 13 + ' + 'TBLOCAL_PROFILE_TYPEBindingSource + ' + Me.TBLOCAL_PROFILE_TYPEBindingSource.DataMember = "TBLOCAL_PROFILE_TYPE" + Me.TBLOCAL_PROFILE_TYPEBindingSource.DataSource = Me.DBCW_Stammdaten + ' 'Root ' Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] Me.Root.GroupBordersVisible = False - Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem2, Me.LayoutControlItem3, Me.LayoutControlItem4, Me.LayoutControlItem6, Me.LayoutControlItem5, Me.LayoutControlItem7, Me.LayoutControlItem9, Me.LayoutControlItem8, Me.LayoutControlItem1}) + Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem2, Me.LayoutControlItem3, Me.LayoutControlItem4, Me.LayoutControlItem6, Me.LayoutControlItem5, Me.LayoutControlItem7, Me.LayoutControlItem9, Me.LayoutControlItem8, Me.LayoutControlItem1, Me.LayoutControlItem20}) Me.Root.Name = "Root" - Me.Root.Size = New System.Drawing.Size(1326, 252) + Me.Root.Size = New System.Drawing.Size(1326, 246) Me.Root.TextVisible = False ' 'LayoutControlItem2 @@ -414,9 +511,9 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 30) Me.LayoutControlItem2.Name = "LayoutControlItem2" Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem2.Size = New System.Drawing.Size(1306, 30) - Me.LayoutControlItem2.Text = "Profil" - Me.LayoutControlItem2.TextSize = New System.Drawing.Size(92, 13) + Me.LayoutControlItem2.Size = New System.Drawing.Size(651, 30) + Me.LayoutControlItem2.Text = "Name" + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(98, 13) ' 'LayoutControlItem3 ' @@ -426,7 +523,7 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem3.Size = New System.Drawing.Size(1306, 30) Me.LayoutControlItem3.Text = "Kommentar" - Me.LayoutControlItem3.TextSize = New System.Drawing.Size(92, 13) + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(98, 13) ' 'LayoutControlItem4 ' @@ -436,7 +533,7 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem4.Size = New System.Drawing.Size(651, 30) Me.LayoutControlItem4.Text = "Erstellt Wer" - Me.LayoutControlItem4.TextSize = New System.Drawing.Size(92, 13) + Me.LayoutControlItem4.TextSize = New System.Drawing.Size(98, 13) ' 'LayoutControlItem6 ' @@ -444,9 +541,9 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 154) Me.LayoutControlItem6.Name = "LayoutControlItem6" Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem6.Size = New System.Drawing.Size(651, 78) + Me.LayoutControlItem6.Size = New System.Drawing.Size(651, 72) Me.LayoutControlItem6.Text = "Geändert Wer" - Me.LayoutControlItem6.TextSize = New System.Drawing.Size(92, 13) + Me.LayoutControlItem6.TextSize = New System.Drawing.Size(98, 13) ' 'LayoutControlItem5 ' @@ -456,7 +553,7 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem5.Size = New System.Drawing.Size(655, 30) Me.LayoutControlItem5.Text = "Erstellt Wann" - Me.LayoutControlItem5.TextSize = New System.Drawing.Size(92, 13) + Me.LayoutControlItem5.TextSize = New System.Drawing.Size(98, 13) ' 'LayoutControlItem7 ' @@ -464,9 +561,9 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem7.Location = New System.Drawing.Point(651, 154) Me.LayoutControlItem7.Name = "LayoutControlItem7" Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem7.Size = New System.Drawing.Size(655, 78) + Me.LayoutControlItem7.Size = New System.Drawing.Size(655, 72) Me.LayoutControlItem7.Text = "Geändert Wann" - Me.LayoutControlItem7.TextSize = New System.Drawing.Size(92, 13) + Me.LayoutControlItem7.TextSize = New System.Drawing.Size(98, 13) ' 'LayoutControlItem9 ' @@ -476,7 +573,7 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem9.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem9.Size = New System.Drawing.Size(1306, 34) Me.LayoutControlItem9.Text = "Regular Expression" - Me.LayoutControlItem9.TextSize = New System.Drawing.Size(92, 13) + Me.LayoutControlItem9.TextSize = New System.Drawing.Size(98, 13) ' 'LayoutControlItem8 ' @@ -496,15 +593,25 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem1.Size = New System.Drawing.Size(651, 30) Me.LayoutControlItem1.Text = "GUID" - Me.LayoutControlItem1.TextSize = New System.Drawing.Size(92, 13) + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(98, 13) + ' + 'LayoutControlItem20 + ' + Me.LayoutControlItem20.Control = Me.cmbProfileType + Me.LayoutControlItem20.Location = New System.Drawing.Point(651, 30) + Me.LayoutControlItem20.Name = "LayoutControlItem20" + Me.LayoutControlItem20.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem20.Size = New System.Drawing.Size(655, 30) + Me.LayoutControlItem20.Text = "Profil Typ" + Me.LayoutControlItem20.TextSize = New System.Drawing.Size(98, 13) ' 'XtraTabControl1 ' Me.XtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.XtraTabControl1.Location = New System.Drawing.Point(0, 132) + Me.XtraTabControl1.Location = New System.Drawing.Point(0, 131) Me.XtraTabControl1.Name = "XtraTabControl1" Me.XtraTabControl1.SelectedTabPage = Me.PageProfile - Me.XtraTabControl1.Size = New System.Drawing.Size(1328, 542) + Me.XtraTabControl1.Size = New System.Drawing.Size(1328, 545) Me.XtraTabControl1.TabIndex = 5 Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.PageProfile}) ' @@ -515,17 +622,17 @@ Partial Class frmAdmin_CWProfile Me.PageProfile.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.pagesetup1 Me.PageProfile.ImageOptions.SvgImageSize = New System.Drawing.Size(24, 24) Me.PageProfile.Name = "PageProfile" - Me.PageProfile.Size = New System.Drawing.Size(1326, 506) + Me.PageProfile.Size = New System.Drawing.Size(1326, 511) Me.PageProfile.Tag = "TAB_PAGE_PROFILE" Me.PageProfile.Text = "Profil-Verwaltung" ' 'XtraTabControl2 ' Me.XtraTabControl2.Dock = System.Windows.Forms.DockStyle.Fill - Me.XtraTabControl2.Location = New System.Drawing.Point(0, 252) + Me.XtraTabControl2.Location = New System.Drawing.Point(0, 246) Me.XtraTabControl2.Name = "XtraTabControl2" Me.XtraTabControl2.SelectedTabPage = Me.PageDocumentSearch - Me.XtraTabControl2.Size = New System.Drawing.Size(1326, 254) + Me.XtraTabControl2.Size = New System.Drawing.Size(1326, 265) Me.XtraTabControl2.TabIndex = 3 Me.XtraTabControl2.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.PageDocumentSearch, Me.PageDataSearch, Me.PageApplicationAssignment}) ' @@ -536,7 +643,7 @@ Partial Class frmAdmin_CWProfile Me.PageDocumentSearch.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.singlepageview Me.PageDocumentSearch.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.PageDocumentSearch.Name = "PageDocumentSearch" - Me.PageDocumentSearch.Size = New System.Drawing.Size(1324, 226) + Me.PageDocumentSearch.Size = New System.Drawing.Size(1324, 239) Me.PageDocumentSearch.Tag = "TAB_PAGE_DOCSEARCH" Me.PageDocumentSearch.Text = "Dokument-Suche" ' @@ -545,29 +652,31 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlDocSearch.Controls.Add(Me.TextEdit5) Me.LayoutControlDocSearch.Controls.Add(Me.TextEdit6) Me.LayoutControlDocSearch.Controls.Add(Me.CheckEdit2) - Me.LayoutControlDocSearch.Controls.Add(Me.ComboBoxEdit1) Me.LayoutControlDocSearch.Controls.Add(Me.TextEdit7) Me.LayoutControlDocSearch.Controls.Add(Me.TextEdit8) Me.LayoutControlDocSearch.Controls.Add(Me.txtAddedWho1) Me.LayoutControlDocSearch.Controls.Add(Me.txtChangedWho1) Me.LayoutControlDocSearch.Controls.Add(Me.txtAddedWhen1) Me.LayoutControlDocSearch.Controls.Add(Me.txtChangedWhen1) + Me.LayoutControlDocSearch.Controls.Add(Me.cmbSearchPositions) + Me.LayoutControlDocSearch.Controls.Add(Me.ComboBoxEdit1) Me.LayoutControlDocSearch.Dock = System.Windows.Forms.DockStyle.Fill Me.LayoutControlDocSearch.Location = New System.Drawing.Point(225, 0) Me.LayoutControlDocSearch.Name = "LayoutControlDocSearch" Me.LayoutControlDocSearch.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(1270, 407, 650, 400) Me.LayoutControlDocSearch.Root = Me.LayoutControlGroup1 - Me.LayoutControlDocSearch.Size = New System.Drawing.Size(1099, 226) + Me.LayoutControlDocSearch.Size = New System.Drawing.Size(1099, 239) Me.LayoutControlDocSearch.TabIndex = 1 Me.LayoutControlDocSearch.Text = "LayoutControl2" ' 'TextEdit5 ' Me.TextEdit5.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "GUID", True)) - Me.TextEdit5.Location = New System.Drawing.Point(140, 15) + Me.TextEdit5.Location = New System.Drawing.Point(150, 15) Me.TextEdit5.MenuManager = Me.RibbonControl1 Me.TextEdit5.Name = "TextEdit5" - Me.TextEdit5.Size = New System.Drawing.Size(134, 20) + Me.TextEdit5.Properties.ReadOnly = True + Me.TextEdit5.Size = New System.Drawing.Size(124, 20) Me.TextEdit5.StyleController = Me.LayoutControlDocSearch Me.TextEdit5.TabIndex = 4 ' @@ -579,10 +688,10 @@ Partial Class frmAdmin_CWProfile 'TextEdit6 ' Me.TextEdit6.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "TAB_TITLE", True)) - Me.TextEdit6.Location = New System.Drawing.Point(140, 45) + Me.TextEdit6.Location = New System.Drawing.Point(150, 45) Me.TextEdit6.MenuManager = Me.RibbonControl1 Me.TextEdit6.Name = "TextEdit6" - Me.TextEdit6.Size = New System.Drawing.Size(944, 20) + Me.TextEdit6.Size = New System.Drawing.Size(934, 20) Me.TextEdit6.StyleController = Me.LayoutControlDocSearch Me.TextEdit6.TabIndex = 5 ' @@ -593,25 +702,14 @@ Partial Class frmAdmin_CWProfile Me.CheckEdit2.MenuManager = Me.RibbonControl1 Me.CheckEdit2.Name = "CheckEdit2" Me.CheckEdit2.Properties.Caption = "Aktiv" - Me.CheckEdit2.Size = New System.Drawing.Size(396, 20) + Me.CheckEdit2.Size = New System.Drawing.Size(396, 18) Me.CheckEdit2.StyleController = Me.LayoutControlDocSearch Me.CheckEdit2.TabIndex = 6 ' - 'ComboBoxEdit1 - ' - Me.ComboBoxEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "TAB_INDEX", True)) - Me.ComboBoxEdit1.Location = New System.Drawing.Point(409, 15) - Me.ComboBoxEdit1.MenuManager = Me.RibbonControl1 - Me.ComboBoxEdit1.Name = "ComboBoxEdit1" - Me.ComboBoxEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.ComboBoxEdit1.Size = New System.Drawing.Size(269, 20) - Me.ComboBoxEdit1.StyleController = Me.LayoutControlDocSearch - Me.ComboBoxEdit1.TabIndex = 7 - ' 'TextEdit7 ' Me.TextEdit7.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "SQL_COMMAND", True)) - Me.TextEdit7.Location = New System.Drawing.Point(140, 75) + Me.TextEdit7.Location = New System.Drawing.Point(150, 75) Me.TextEdit7.MenuManager = Me.RibbonControl1 Me.TextEdit7.Name = "TextEdit7" EditorButtonImageOptions2.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.editdatasource @@ -619,14 +717,14 @@ Partial Class frmAdmin_CWProfile SerializableAppearanceObject5.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(49, Byte), Integer)) SerializableAppearanceObject5.Options.UseBackColor = True Me.TextEdit7.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", 50, True, True, False, EditorButtonImageOptions2, New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), SerializableAppearanceObject5, SerializableAppearanceObject6, SerializableAppearanceObject7, SerializableAppearanceObject8, "", "BUTTON_SEARCH_SQL", Nothing, DevExpress.Utils.ToolTipAnchor.[Default])}) - Me.TextEdit7.Size = New System.Drawing.Size(944, 24) + Me.TextEdit7.Size = New System.Drawing.Size(934, 24) Me.TextEdit7.StyleController = Me.LayoutControlDocSearch Me.TextEdit7.TabIndex = 8 ' 'TextEdit8 ' Me.TextEdit8.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "COUNT_COMMAND", True)) - Me.TextEdit8.Location = New System.Drawing.Point(140, 109) + Me.TextEdit8.Location = New System.Drawing.Point(150, 109) Me.TextEdit8.MenuManager = Me.RibbonControl1 Me.TextEdit8.Name = "TextEdit8" EditorButtonImageOptions3.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.editdatasource1 @@ -634,57 +732,106 @@ Partial Class frmAdmin_CWProfile SerializableAppearanceObject9.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(49, Byte), Integer)) SerializableAppearanceObject9.Options.UseBackColor = True Me.TextEdit8.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "SQL bearbeiten", 50, True, True, False, EditorButtonImageOptions3, New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), SerializableAppearanceObject9, SerializableAppearanceObject10, SerializableAppearanceObject11, SerializableAppearanceObject12, "", "BUTTON_COUNT_SQL", Nothing, DevExpress.Utils.ToolTipAnchor.[Default])}) - Me.TextEdit8.Size = New System.Drawing.Size(944, 24) + Me.TextEdit8.Size = New System.Drawing.Size(934, 24) Me.TextEdit8.StyleController = Me.LayoutControlDocSearch Me.TextEdit8.TabIndex = 9 ' 'txtAddedWho1 ' Me.txtAddedWho1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "ADDED_WHO", True)) - Me.txtAddedWho1.Location = New System.Drawing.Point(140, 143) + Me.txtAddedWho1.Location = New System.Drawing.Point(150, 173) Me.txtAddedWho1.Name = "txtAddedWho1" Me.txtAddedWho1.Properties.ReadOnly = True - Me.txtAddedWho1.Size = New System.Drawing.Size(403, 20) + Me.txtAddedWho1.Size = New System.Drawing.Size(393, 20) Me.txtAddedWho1.StyleController = Me.LayoutControlDocSearch Me.txtAddedWho1.TabIndex = 7 ' 'txtChangedWho1 ' Me.txtChangedWho1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "CHANGED_WHO", True)) - Me.txtChangedWho1.Location = New System.Drawing.Point(140, 173) + Me.txtChangedWho1.Location = New System.Drawing.Point(150, 203) Me.txtChangedWho1.Name = "txtChangedWho1" Me.txtChangedWho1.Properties.ReadOnly = True - Me.txtChangedWho1.Size = New System.Drawing.Size(403, 20) + Me.txtChangedWho1.Size = New System.Drawing.Size(393, 20) Me.txtChangedWho1.StyleController = Me.LayoutControlDocSearch Me.txtChangedWho1.TabIndex = 9 ' 'txtAddedWhen1 ' Me.txtAddedWhen1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "ADDED_WHEN", True)) - Me.txtAddedWhen1.Location = New System.Drawing.Point(678, 143) + Me.txtAddedWhen1.Location = New System.Drawing.Point(688, 173) Me.txtAddedWhen1.Name = "txtAddedWhen1" Me.txtAddedWhen1.Properties.ReadOnly = True - Me.txtAddedWhen1.Size = New System.Drawing.Size(406, 20) + Me.txtAddedWhen1.Size = New System.Drawing.Size(396, 20) Me.txtAddedWhen1.StyleController = Me.LayoutControlDocSearch Me.txtAddedWhen1.TabIndex = 8 ' 'txtChangedWhen1 ' Me.txtChangedWhen1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "CHANGED_WHEN", True)) - Me.txtChangedWhen1.Location = New System.Drawing.Point(678, 173) + Me.txtChangedWhen1.Location = New System.Drawing.Point(688, 203) Me.txtChangedWhen1.Name = "txtChangedWhen1" Me.txtChangedWhen1.Properties.ReadOnly = True - Me.txtChangedWhen1.Size = New System.Drawing.Size(406, 20) + Me.txtChangedWhen1.Size = New System.Drawing.Size(396, 20) Me.txtChangedWhen1.StyleController = Me.LayoutControlDocSearch Me.txtChangedWhen1.TabIndex = 10 ' + 'cmbSearchPositions + ' + Me.cmbSearchPositions.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "TAB_INDEX", True)) + Me.cmbSearchPositions.Location = New System.Drawing.Point(419, 15) + Me.cmbSearchPositions.MenuManager = Me.RibbonControl1 + Me.cmbSearchPositions.Name = "cmbSearchPositions" + Me.cmbSearchPositions.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.cmbSearchPositions.Properties.Columns.AddRange(New DevExpress.XtraEditors.Controls.LookUpColumnInfo() {New DevExpress.XtraEditors.Controls.LookUpColumnInfo("NAME", "Name")}) + Me.cmbSearchPositions.Properties.DataSource = Me.TBLOCAL_SEARCH_POSITIONBindingSource + Me.cmbSearchPositions.Properties.DisplayMember = "NAME" + Me.cmbSearchPositions.Properties.NullText = "" + Me.cmbSearchPositions.Properties.PopupSizeable = False + Me.cmbSearchPositions.Properties.ValueMember = "ID" + Me.cmbSearchPositions.Size = New System.Drawing.Size(259, 20) + Me.cmbSearchPositions.StyleController = Me.LayoutControlDocSearch + Me.cmbSearchPositions.TabIndex = 7 + ' + 'TBLOCAL_SEARCH_POSITIONBindingSource + ' + Me.TBLOCAL_SEARCH_POSITIONBindingSource.DataMember = "TBLOCAL_SEARCH_POSITION" + Me.TBLOCAL_SEARCH_POSITIONBindingSource.DataSource = Me.DBCW_Stammdaten + ' + 'ComboBoxEdit1 + ' + Me.ComboBoxEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "CONN_ID", True)) + Me.ComboBoxEdit1.Location = New System.Drawing.Point(150, 143) + Me.ComboBoxEdit1.MenuManager = Me.RibbonControl1 + Me.ComboBoxEdit1.Name = "ComboBoxEdit1" + Me.ComboBoxEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.ComboBoxEdit1.Properties.Columns.AddRange(New DevExpress.XtraEditors.Controls.LookUpColumnInfo() {New DevExpress.XtraEditors.Controls.LookUpColumnInfo("BEZEICHNUNG", "Name")}) + Me.ComboBoxEdit1.Properties.DataSource = Me.TBDD_CONNECTIONBindingSource + Me.ComboBoxEdit1.Properties.DisplayMember = "BEZEICHNUNG" + Me.ComboBoxEdit1.Properties.NullText = "" + Me.ComboBoxEdit1.Properties.PopupSizeable = False + Me.ComboBoxEdit1.Properties.ValueMember = "GUID" + Me.ComboBoxEdit1.Size = New System.Drawing.Size(934, 20) + Me.ComboBoxEdit1.StyleController = Me.LayoutControlDocSearch + Me.ComboBoxEdit1.TabIndex = 11 + ' + 'TBDD_CONNECTIONBindingSource + ' + Me.TBDD_CONNECTIONBindingSource.DataMember = "TBDD_CONNECTION" + Me.TBDD_CONNECTIONBindingSource.DataSource = Me.DSDD_Stammdaten + ' + 'DSDD_Stammdaten + ' + Me.DSDD_Stammdaten.DataSetName = "DSDD_Stammdaten" + Me.DSDD_Stammdaten.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema + ' 'LayoutControlGroup1 ' Me.LayoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] Me.LayoutControlGroup1.GroupBordersVisible = False - Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem10, Me.LayoutControlItem11, Me.LayoutControlItem13, Me.LayoutControlItem12, Me.LayoutControlItem14, Me.LayoutControlItem15, Me.LayoutControlItem16, Me.LayoutControlItem17, Me.LayoutControlItem18, Me.LayoutControlItem19}) + Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem10, Me.LayoutControlItem11, Me.LayoutControlItem13, Me.LayoutControlItem12, Me.LayoutControlItem14, Me.LayoutControlItem15, Me.LayoutControlItem16, Me.LayoutControlItem17, Me.LayoutControlItem18, Me.LayoutControlItem19, Me.LayoutControlItem21}) Me.LayoutControlGroup1.Name = "Root" - Me.LayoutControlGroup1.Size = New System.Drawing.Size(1099, 226) + Me.LayoutControlGroup1.Size = New System.Drawing.Size(1099, 239) Me.LayoutControlGroup1.TextVisible = False ' 'LayoutControlItem10 @@ -695,7 +842,7 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem10.Size = New System.Drawing.Size(269, 30) Me.LayoutControlItem10.Text = "GUID" - Me.LayoutControlItem10.TextSize = New System.Drawing.Size(122, 13) + Me.LayoutControlItem10.TextSize = New System.Drawing.Size(132, 13) ' 'LayoutControlItem11 ' @@ -705,17 +852,17 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem11.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem11.Size = New System.Drawing.Size(1079, 30) Me.LayoutControlItem11.Text = "Name" - Me.LayoutControlItem11.TextSize = New System.Drawing.Size(122, 13) + Me.LayoutControlItem11.TextSize = New System.Drawing.Size(132, 13) ' 'LayoutControlItem13 ' - Me.LayoutControlItem13.Control = Me.ComboBoxEdit1 + Me.LayoutControlItem13.Control = Me.cmbSearchPositions Me.LayoutControlItem13.Location = New System.Drawing.Point(269, 0) Me.LayoutControlItem13.Name = "LayoutControlItem13" Me.LayoutControlItem13.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem13.Size = New System.Drawing.Size(404, 30) Me.LayoutControlItem13.Text = "Reihenfolge" - Me.LayoutControlItem13.TextSize = New System.Drawing.Size(122, 13) + Me.LayoutControlItem13.TextSize = New System.Drawing.Size(132, 13) ' 'LayoutControlItem12 ' @@ -735,7 +882,7 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem14.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem14.Size = New System.Drawing.Size(1079, 34) Me.LayoutControlItem14.Text = "SQL für Suche" - Me.LayoutControlItem14.TextSize = New System.Drawing.Size(122, 13) + Me.LayoutControlItem14.TextSize = New System.Drawing.Size(132, 13) ' 'LayoutControlItem15 ' @@ -745,55 +892,65 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem15.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem15.Size = New System.Drawing.Size(1079, 34) Me.LayoutControlItem15.Text = "SQL für Ergebnis-Zählung" - Me.LayoutControlItem15.TextSize = New System.Drawing.Size(122, 13) + Me.LayoutControlItem15.TextSize = New System.Drawing.Size(132, 13) ' 'LayoutControlItem16 ' Me.LayoutControlItem16.Control = Me.txtAddedWho1 Me.LayoutControlItem16.ControlAlignment = System.Drawing.ContentAlignment.TopLeft Me.LayoutControlItem16.CustomizationFormText = "Erstellt Wer" - Me.LayoutControlItem16.Location = New System.Drawing.Point(0, 128) + Me.LayoutControlItem16.Location = New System.Drawing.Point(0, 158) Me.LayoutControlItem16.Name = "LayoutControlItem16" Me.LayoutControlItem16.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem16.Size = New System.Drawing.Size(538, 30) Me.LayoutControlItem16.Text = "Erstellt Wer" - Me.LayoutControlItem16.TextSize = New System.Drawing.Size(122, 13) + Me.LayoutControlItem16.TextSize = New System.Drawing.Size(132, 13) ' 'LayoutControlItem17 ' Me.LayoutControlItem17.Control = Me.txtChangedWho1 Me.LayoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft Me.LayoutControlItem17.CustomizationFormText = "Geändert Wer" - Me.LayoutControlItem17.Location = New System.Drawing.Point(0, 158) + Me.LayoutControlItem17.Location = New System.Drawing.Point(0, 188) Me.LayoutControlItem17.Name = "LayoutControlItem17" Me.LayoutControlItem17.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem17.Size = New System.Drawing.Size(538, 48) + Me.LayoutControlItem17.Size = New System.Drawing.Size(538, 31) Me.LayoutControlItem17.Text = "Geändert Wer" - Me.LayoutControlItem17.TextSize = New System.Drawing.Size(122, 13) + Me.LayoutControlItem17.TextSize = New System.Drawing.Size(132, 13) ' 'LayoutControlItem18 ' Me.LayoutControlItem18.Control = Me.txtAddedWhen1 Me.LayoutControlItem18.ControlAlignment = System.Drawing.ContentAlignment.TopLeft Me.LayoutControlItem18.CustomizationFormText = "Erstellt Wann" - Me.LayoutControlItem18.Location = New System.Drawing.Point(538, 128) + Me.LayoutControlItem18.Location = New System.Drawing.Point(538, 158) Me.LayoutControlItem18.Name = "LayoutControlItem18" Me.LayoutControlItem18.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem18.Size = New System.Drawing.Size(541, 30) Me.LayoutControlItem18.Text = "Erstellt Wann" - Me.LayoutControlItem18.TextSize = New System.Drawing.Size(122, 13) + Me.LayoutControlItem18.TextSize = New System.Drawing.Size(132, 13) ' 'LayoutControlItem19 ' Me.LayoutControlItem19.Control = Me.txtChangedWhen1 Me.LayoutControlItem19.ControlAlignment = System.Drawing.ContentAlignment.TopLeft Me.LayoutControlItem19.CustomizationFormText = "Geändert Wann" - Me.LayoutControlItem19.Location = New System.Drawing.Point(538, 158) + Me.LayoutControlItem19.Location = New System.Drawing.Point(538, 188) Me.LayoutControlItem19.Name = "LayoutControlItem19" Me.LayoutControlItem19.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem19.Size = New System.Drawing.Size(541, 48) + Me.LayoutControlItem19.Size = New System.Drawing.Size(541, 31) Me.LayoutControlItem19.Text = "Geändert Wann" - Me.LayoutControlItem19.TextSize = New System.Drawing.Size(122, 13) + Me.LayoutControlItem19.TextSize = New System.Drawing.Size(132, 13) + ' + 'LayoutControlItem21 + ' + Me.LayoutControlItem21.Control = Me.ComboBoxEdit1 + Me.LayoutControlItem21.Location = New System.Drawing.Point(0, 128) + Me.LayoutControlItem21.Name = "LayoutControlItem21" + Me.LayoutControlItem21.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem21.Size = New System.Drawing.Size(1079, 30) + Me.LayoutControlItem21.Text = "Datenbank Verbindung" + Me.LayoutControlItem21.TextSize = New System.Drawing.Size(132, 13) ' 'GridControl2 ' @@ -803,7 +960,7 @@ Partial Class frmAdmin_CWProfile Me.GridControl2.MainView = Me.GridViewDocSearch Me.GridControl2.MenuManager = Me.RibbonControl1 Me.GridControl2.Name = "GridControl2" - Me.GridControl2.Size = New System.Drawing.Size(225, 226) + Me.GridControl2.Size = New System.Drawing.Size(225, 239) Me.GridControl2.TabIndex = 2 Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDocSearch}) ' @@ -827,27 +984,307 @@ Partial Class frmAdmin_CWProfile Me.PageDataSearch.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_database Me.PageDataSearch.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.PageDataSearch.Name = "PageDataSearch" - Me.PageDataSearch.Size = New System.Drawing.Size(1324, 226) + Me.PageDataSearch.Size = New System.Drawing.Size(1324, 239) Me.PageDataSearch.Text = "Daten-Suchen" ' 'LayoutControlDataSearch ' + Me.LayoutControlDataSearch.Controls.Add(Me.TextEdit51) + Me.LayoutControlDataSearch.Controls.Add(Me.TextEdit61) + Me.LayoutControlDataSearch.Controls.Add(Me.cmbSearchPositions1) + Me.LayoutControlDataSearch.Controls.Add(Me.CheckEdit21) + Me.LayoutControlDataSearch.Controls.Add(Me.TextEdit71) + Me.LayoutControlDataSearch.Controls.Add(Me.TextEdit81) + Me.LayoutControlDataSearch.Controls.Add(Me.txtAddedWho11) + Me.LayoutControlDataSearch.Controls.Add(Me.txtChangedWho11) + Me.LayoutControlDataSearch.Controls.Add(Me.txtAddedWhen11) + Me.LayoutControlDataSearch.Controls.Add(Me.txtChangedWhen11) + Me.LayoutControlDataSearch.Controls.Add(Me.ComboBoxEdit11) Me.LayoutControlDataSearch.Dock = System.Windows.Forms.DockStyle.Fill Me.LayoutControlDataSearch.Location = New System.Drawing.Point(225, 0) Me.LayoutControlDataSearch.Name = "LayoutControlDataSearch" + Me.LayoutControlDataSearch.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(1270, 407, 650, 400) Me.LayoutControlDataSearch.Root = Me.LayoutControlGroup2 - Me.LayoutControlDataSearch.Size = New System.Drawing.Size(1099, 226) + Me.LayoutControlDataSearch.Size = New System.Drawing.Size(1099, 239) Me.LayoutControlDataSearch.TabIndex = 1 Me.LayoutControlDataSearch.Text = "LayoutControl1" ' + 'TextEdit51 + ' + Me.TextEdit51.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DATA_SEARCHBindingSource, "GUID", True)) + Me.TextEdit51.Location = New System.Drawing.Point(150, 15) + Me.TextEdit51.Name = "TextEdit51" + Me.TextEdit51.Properties.ReadOnly = True + Me.TextEdit51.Size = New System.Drawing.Size(127, 20) + Me.TextEdit51.StyleController = Me.LayoutControlDataSearch + Me.TextEdit51.TabIndex = 4 + ' + 'TBCW_PROF_DATA_SEARCHBindingSource + ' + Me.TBCW_PROF_DATA_SEARCHBindingSource.DataMember = "TBCW_PROF_DATA_SEARCH" + Me.TBCW_PROF_DATA_SEARCHBindingSource.DataSource = Me.DBCW_Stammdaten + ' + 'TextEdit61 + ' + Me.TextEdit61.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DATA_SEARCHBindingSource, "TAB_TITLE", True)) + Me.TextEdit61.Location = New System.Drawing.Point(150, 45) + Me.TextEdit61.Name = "TextEdit61" + Me.TextEdit61.Size = New System.Drawing.Size(934, 20) + Me.TextEdit61.StyleController = Me.LayoutControlDataSearch + Me.TextEdit61.TabIndex = 5 + ' + 'cmbSearchPositions1 + ' + Me.cmbSearchPositions1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DATA_SEARCHBindingSource, "TAB_INDEX", True)) + Me.cmbSearchPositions1.Location = New System.Drawing.Point(422, 15) + Me.cmbSearchPositions1.Name = "cmbSearchPositions1" + Me.cmbSearchPositions1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.cmbSearchPositions1.Properties.Columns.AddRange(New DevExpress.XtraEditors.Controls.LookUpColumnInfo() {New DevExpress.XtraEditors.Controls.LookUpColumnInfo("NAME", "Name")}) + Me.cmbSearchPositions1.Properties.DataSource = Me.TBLOCAL_SEARCH_POSITIONBindingSource + Me.cmbSearchPositions1.Properties.DisplayMember = "NAME" + Me.cmbSearchPositions1.Properties.NullText = "" + Me.cmbSearchPositions1.Properties.PopupSizeable = False + Me.cmbSearchPositions1.Properties.ValueMember = "ID" + Me.cmbSearchPositions1.Size = New System.Drawing.Size(254, 20) + Me.cmbSearchPositions1.StyleController = Me.LayoutControlDataSearch + Me.cmbSearchPositions1.TabIndex = 7 + ' + 'CheckEdit21 + ' + Me.CheckEdit21.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DATA_SEARCHBindingSource, "ACTIVE", True)) + Me.CheckEdit21.Location = New System.Drawing.Point(686, 15) + Me.CheckEdit21.Name = "CheckEdit21" + Me.CheckEdit21.Properties.Caption = "Aktiv" + Me.CheckEdit21.Size = New System.Drawing.Size(398, 18) + Me.CheckEdit21.StyleController = Me.LayoutControlDataSearch + Me.CheckEdit21.TabIndex = 6 + ' + 'TextEdit71 + ' + Me.TextEdit71.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DATA_SEARCHBindingSource, "SQL_COMMAND", True)) + Me.TextEdit71.Location = New System.Drawing.Point(150, 75) + Me.TextEdit71.Name = "TextEdit71" + EditorButtonImageOptions4.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.editdatasource + EditorButtonImageOptions4.SvgImageSize = New System.Drawing.Size(16, 16) + SerializableAppearanceObject13.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(49, Byte), Integer)) + SerializableAppearanceObject13.Options.UseBackColor = True + Me.TextEdit71.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", 50, True, True, False, EditorButtonImageOptions4, New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), SerializableAppearanceObject13, SerializableAppearanceObject14, SerializableAppearanceObject15, SerializableAppearanceObject16, "", "BUTTON_SEARCH_SQL", Nothing, DevExpress.Utils.ToolTipAnchor.[Default])}) + Me.TextEdit71.Size = New System.Drawing.Size(934, 24) + Me.TextEdit71.StyleController = Me.LayoutControlDataSearch + Me.TextEdit71.TabIndex = 8 + ' + 'TextEdit81 + ' + Me.TextEdit81.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DATA_SEARCHBindingSource, "COUNT_COMMAND", True)) + Me.TextEdit81.Location = New System.Drawing.Point(150, 109) + Me.TextEdit81.Name = "TextEdit81" + EditorButtonImageOptions5.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.editdatasource1 + EditorButtonImageOptions5.SvgImageSize = New System.Drawing.Size(16, 16) + SerializableAppearanceObject17.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(49, Byte), Integer)) + SerializableAppearanceObject17.Options.UseBackColor = True + Me.TextEdit81.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "SQL bearbeiten", 50, True, True, False, EditorButtonImageOptions5, New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), SerializableAppearanceObject17, SerializableAppearanceObject18, SerializableAppearanceObject19, SerializableAppearanceObject20, "", "BUTTON_COUNT_SQL", Nothing, DevExpress.Utils.ToolTipAnchor.[Default])}) + Me.TextEdit81.Size = New System.Drawing.Size(934, 24) + Me.TextEdit81.StyleController = Me.LayoutControlDataSearch + Me.TextEdit81.TabIndex = 9 + ' + 'txtAddedWho11 + ' + Me.txtAddedWho11.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DATA_SEARCHBindingSource, "ADDED_WHO", True)) + Me.txtAddedWho11.Location = New System.Drawing.Point(150, 173) + Me.txtAddedWho11.Name = "txtAddedWho11" + Me.txtAddedWho11.Properties.ReadOnly = True + Me.txtAddedWho11.Size = New System.Drawing.Size(394, 20) + Me.txtAddedWho11.StyleController = Me.LayoutControlDataSearch + Me.txtAddedWho11.TabIndex = 7 + ' + 'txtChangedWho11 + ' + Me.txtChangedWho11.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DATA_SEARCHBindingSource, "CHANGED_WHO", True)) + Me.txtChangedWho11.Location = New System.Drawing.Point(150, 203) + Me.txtChangedWho11.Name = "txtChangedWho11" + Me.txtChangedWho11.Properties.ReadOnly = True + Me.txtChangedWho11.Size = New System.Drawing.Size(394, 20) + Me.txtChangedWho11.StyleController = Me.LayoutControlDataSearch + Me.txtChangedWho11.TabIndex = 9 + ' + 'txtAddedWhen11 + ' + Me.txtAddedWhen11.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DATA_SEARCHBindingSource, "ADDED_WHEN", True)) + Me.txtAddedWhen11.Location = New System.Drawing.Point(689, 173) + Me.txtAddedWhen11.Name = "txtAddedWhen11" + Me.txtAddedWhen11.Properties.ReadOnly = True + Me.txtAddedWhen11.Size = New System.Drawing.Size(395, 20) + Me.txtAddedWhen11.StyleController = Me.LayoutControlDataSearch + Me.txtAddedWhen11.TabIndex = 8 + ' + 'txtChangedWhen11 + ' + Me.txtChangedWhen11.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DATA_SEARCHBindingSource, "CHANGED_WHEN", True)) + Me.txtChangedWhen11.Location = New System.Drawing.Point(689, 203) + Me.txtChangedWhen11.Name = "txtChangedWhen11" + Me.txtChangedWhen11.Properties.ReadOnly = True + Me.txtChangedWhen11.Size = New System.Drawing.Size(395, 20) + Me.txtChangedWhen11.StyleController = Me.LayoutControlDataSearch + Me.txtChangedWhen11.TabIndex = 10 + ' + 'ComboBoxEdit11 + ' + Me.ComboBoxEdit11.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DATA_SEARCHBindingSource, "CONN_ID", True)) + Me.ComboBoxEdit11.Location = New System.Drawing.Point(150, 143) + Me.ComboBoxEdit11.Name = "ComboBoxEdit11" + Me.ComboBoxEdit11.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.ComboBoxEdit11.Properties.Columns.AddRange(New DevExpress.XtraEditors.Controls.LookUpColumnInfo() {New DevExpress.XtraEditors.Controls.LookUpColumnInfo("BEZEICHNUNG", "Name")}) + Me.ComboBoxEdit11.Properties.DataSource = Me.TBDD_CONNECTIONBindingSource + Me.ComboBoxEdit11.Properties.DisplayMember = "BEZEICHNUNG" + Me.ComboBoxEdit11.Properties.NullText = "" + Me.ComboBoxEdit11.Properties.PopupSizeable = False + Me.ComboBoxEdit11.Properties.ValueMember = "GUID" + Me.ComboBoxEdit11.Size = New System.Drawing.Size(934, 20) + Me.ComboBoxEdit11.StyleController = Me.LayoutControlDataSearch + Me.ComboBoxEdit11.TabIndex = 11 + ' 'LayoutControlGroup2 ' Me.LayoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] Me.LayoutControlGroup2.GroupBordersVisible = False - Me.LayoutControlGroup2.Name = "LayoutControlGroup2" - Me.LayoutControlGroup2.Size = New System.Drawing.Size(1099, 226) + Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem22, Me.LayoutControlItem23, Me.LayoutControlItem26, Me.LayoutControlItem27, Me.LayoutControlItem32, Me.LayoutControlItem28, Me.LayoutControlItem29, Me.LayoutControlItem30, Me.LayoutControlItem31, Me.LayoutControlItem24, Me.LayoutControlItem25}) + Me.LayoutControlGroup2.Name = "Root" + Me.LayoutControlGroup2.Size = New System.Drawing.Size(1099, 239) Me.LayoutControlGroup2.TextVisible = False ' + 'LayoutControlItem22 + ' + Me.LayoutControlItem22.Control = Me.TextEdit51 + Me.LayoutControlItem22.ControlAlignment = System.Drawing.ContentAlignment.TopLeft + Me.LayoutControlItem22.CustomizationFormText = "GUID" + Me.LayoutControlItem22.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlItem22.Name = "LayoutControlItem22" + Me.LayoutControlItem22.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem22.Size = New System.Drawing.Size(272, 30) + Me.LayoutControlItem22.Text = "GUID" + Me.LayoutControlItem22.TextSize = New System.Drawing.Size(132, 13) + ' + 'LayoutControlItem23 + ' + Me.LayoutControlItem23.Control = Me.TextEdit61 + Me.LayoutControlItem23.ControlAlignment = System.Drawing.ContentAlignment.TopLeft + Me.LayoutControlItem23.CustomizationFormText = "Name" + Me.LayoutControlItem23.Location = New System.Drawing.Point(0, 30) + Me.LayoutControlItem23.Name = "LayoutControlItem23" + Me.LayoutControlItem23.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem23.Size = New System.Drawing.Size(1079, 30) + Me.LayoutControlItem23.Text = "Name" + Me.LayoutControlItem23.TextSize = New System.Drawing.Size(132, 13) + ' + 'LayoutControlItem26 + ' + Me.LayoutControlItem26.Control = Me.TextEdit71 + Me.LayoutControlItem26.ControlAlignment = System.Drawing.ContentAlignment.TopLeft + Me.LayoutControlItem26.CustomizationFormText = "SQL für Suche" + Me.LayoutControlItem26.Location = New System.Drawing.Point(0, 60) + Me.LayoutControlItem26.Name = "LayoutControlItem26" + Me.LayoutControlItem26.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem26.Size = New System.Drawing.Size(1079, 34) + Me.LayoutControlItem26.Text = "SQL für Suche" + Me.LayoutControlItem26.TextSize = New System.Drawing.Size(132, 13) + ' + 'LayoutControlItem27 + ' + Me.LayoutControlItem27.Control = Me.TextEdit81 + Me.LayoutControlItem27.ControlAlignment = System.Drawing.ContentAlignment.TopLeft + Me.LayoutControlItem27.CustomizationFormText = "SQL für Ergebnis-Zählung" + Me.LayoutControlItem27.Location = New System.Drawing.Point(0, 94) + Me.LayoutControlItem27.Name = "LayoutControlItem27" + Me.LayoutControlItem27.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem27.Size = New System.Drawing.Size(1079, 34) + Me.LayoutControlItem27.Text = "SQL für Ergebnis-Zählung" + Me.LayoutControlItem27.TextSize = New System.Drawing.Size(132, 13) + ' + 'LayoutControlItem32 + ' + Me.LayoutControlItem32.Control = Me.ComboBoxEdit11 + Me.LayoutControlItem32.ControlAlignment = System.Drawing.ContentAlignment.TopLeft + Me.LayoutControlItem32.CustomizationFormText = "Datenbank Verbindung" + Me.LayoutControlItem32.Location = New System.Drawing.Point(0, 128) + Me.LayoutControlItem32.Name = "LayoutControlItem32" + Me.LayoutControlItem32.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem32.Size = New System.Drawing.Size(1079, 30) + Me.LayoutControlItem32.Text = "Datenbank Verbindung" + Me.LayoutControlItem32.TextSize = New System.Drawing.Size(132, 13) + ' + 'LayoutControlItem28 + ' + Me.LayoutControlItem28.Control = Me.txtAddedWho11 + Me.LayoutControlItem28.ControlAlignment = System.Drawing.ContentAlignment.TopLeft + Me.LayoutControlItem28.CustomizationFormText = "Erstellt Wer" + Me.LayoutControlItem28.Location = New System.Drawing.Point(0, 158) + Me.LayoutControlItem28.Name = "LayoutControlItem28" + Me.LayoutControlItem28.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem28.Size = New System.Drawing.Size(539, 30) + Me.LayoutControlItem28.Text = "Erstellt Wer" + Me.LayoutControlItem28.TextSize = New System.Drawing.Size(132, 13) + ' + 'LayoutControlItem29 + ' + Me.LayoutControlItem29.Control = Me.txtChangedWho11 + Me.LayoutControlItem29.ControlAlignment = System.Drawing.ContentAlignment.TopLeft + Me.LayoutControlItem29.CustomizationFormText = "Geändert Wer" + Me.LayoutControlItem29.Location = New System.Drawing.Point(0, 188) + Me.LayoutControlItem29.Name = "LayoutControlItem29" + Me.LayoutControlItem29.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem29.Size = New System.Drawing.Size(539, 31) + Me.LayoutControlItem29.Text = "Geändert Wer" + Me.LayoutControlItem29.TextSize = New System.Drawing.Size(132, 13) + ' + 'LayoutControlItem30 + ' + Me.LayoutControlItem30.Control = Me.txtAddedWhen11 + Me.LayoutControlItem30.ControlAlignment = System.Drawing.ContentAlignment.TopLeft + Me.LayoutControlItem30.CustomizationFormText = "Erstellt Wann" + Me.LayoutControlItem30.Location = New System.Drawing.Point(539, 158) + Me.LayoutControlItem30.Name = "LayoutControlItem30" + Me.LayoutControlItem30.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem30.Size = New System.Drawing.Size(540, 30) + Me.LayoutControlItem30.Text = "Erstellt Wann" + Me.LayoutControlItem30.TextSize = New System.Drawing.Size(132, 13) + ' + 'LayoutControlItem31 + ' + Me.LayoutControlItem31.Control = Me.txtChangedWhen11 + Me.LayoutControlItem31.ControlAlignment = System.Drawing.ContentAlignment.TopLeft + Me.LayoutControlItem31.CustomizationFormText = "Geändert Wann" + Me.LayoutControlItem31.Location = New System.Drawing.Point(539, 188) + Me.LayoutControlItem31.Name = "LayoutControlItem31" + Me.LayoutControlItem31.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem31.Size = New System.Drawing.Size(540, 31) + Me.LayoutControlItem31.Text = "Geändert Wann" + Me.LayoutControlItem31.TextSize = New System.Drawing.Size(132, 13) + ' + 'LayoutControlItem24 + ' + Me.LayoutControlItem24.Control = Me.cmbSearchPositions1 + Me.LayoutControlItem24.ControlAlignment = System.Drawing.ContentAlignment.TopLeft + Me.LayoutControlItem24.CustomizationFormText = "Reihenfolge" + Me.LayoutControlItem24.Location = New System.Drawing.Point(272, 0) + Me.LayoutControlItem24.Name = "LayoutControlItem24" + Me.LayoutControlItem24.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem24.Size = New System.Drawing.Size(399, 30) + Me.LayoutControlItem24.Text = "Reihenfolge" + Me.LayoutControlItem24.TextSize = New System.Drawing.Size(132, 13) + ' + 'LayoutControlItem25 + ' + Me.LayoutControlItem25.Control = Me.CheckEdit21 + Me.LayoutControlItem25.ControlAlignment = System.Drawing.ContentAlignment.TopLeft + Me.LayoutControlItem25.CustomizationFormText = "LayoutControlItem12" + Me.LayoutControlItem25.Location = New System.Drawing.Point(671, 0) + Me.LayoutControlItem25.Name = "LayoutControlItem25" + Me.LayoutControlItem25.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem25.Size = New System.Drawing.Size(408, 30) + Me.LayoutControlItem25.Text = "LayoutControlItem12" + Me.LayoutControlItem25.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem25.TextVisible = False + ' 'GridControl1 ' Me.GridControl1.DataSource = Me.TBCW_PROF_DATA_SEARCHBindingSource @@ -856,15 +1293,10 @@ Partial Class frmAdmin_CWProfile Me.GridControl1.MainView = Me.GridViewDataSearch Me.GridControl1.MenuManager = Me.RibbonControl1 Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(225, 226) + Me.GridControl1.Size = New System.Drawing.Size(225, 239) Me.GridControl1.TabIndex = 0 Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDataSearch}) ' - 'TBCW_PROF_DATA_SEARCHBindingSource - ' - Me.TBCW_PROF_DATA_SEARCHBindingSource.DataMember = "TBCW_PROF_DATA_SEARCH" - Me.TBCW_PROF_DATA_SEARCHBindingSource.DataSource = Me.DBCW_Stammdaten - ' 'GridViewDataSearch ' Me.GridViewDataSearch.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colTAB_TITLE}) @@ -883,7 +1315,7 @@ Partial Class frmAdmin_CWProfile Me.PageApplicationAssignment.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.windows Me.PageApplicationAssignment.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.PageApplicationAssignment.Name = "PageApplicationAssignment" - Me.PageApplicationAssignment.Size = New System.Drawing.Size(1324, 226) + Me.PageApplicationAssignment.Size = New System.Drawing.Size(1324, 239) Me.PageApplicationAssignment.Text = "Anwendungs-Zuordnung" ' 'TBCW_PROF_DOC_SEARCHTableAdapter @@ -894,7 +1326,17 @@ Partial Class frmAdmin_CWProfile ' Me.TBCW_PROF_DATA_SEARCHTableAdapter.ClearBeforeFill = True ' - 'frmAdmin_CWProfile + 'TBDD_CONNECTIONTableAdapter + ' + Me.TBDD_CONNECTIONTableAdapter.ClearBeforeFill = True + ' + 'TableAdapterManager1 + ' + Me.TableAdapterManager1.BackupDataSetBeforeUpdate = False + Me.TableAdapterManager1.TBDD_CONNECTIONTableAdapter = Me.TBDD_CONNECTIONTableAdapter + Me.TableAdapterManager1.UpdateOrder = DigitalData.GUIs.ZooFlow.DSDD_StammdatenTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete + ' + 'frmAdmin_ClipboardWatcher ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font @@ -902,7 +1344,7 @@ Partial Class frmAdmin_CWProfile Me.Controls.Add(Me.XtraTabControl1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) - Me.Name = "frmAdmin_CWProfile" + Me.Name = "frmAdmin_ClipboardWatcher" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 Me.Text = "Clipboard Watcher - Profil" @@ -920,6 +1362,8 @@ Partial Class frmAdmin_CWProfile CType(Me.txtChangedWhen.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.CheckEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit4.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.cmbProfileType.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TBLOCAL_PROFILE_TYPEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() @@ -930,6 +1374,7 @@ Partial Class frmAdmin_CWProfile CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem20, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabControl1.ResumeLayout(False) Me.PageProfile.ResumeLayout(False) @@ -942,13 +1387,17 @@ Partial Class frmAdmin_CWProfile CType(Me.TBCW_PROF_DOC_SEARCHBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit6.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.CheckEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit7.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit8.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtAddedWho1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtChangedWho1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtAddedWhen1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtChangedWhen1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.cmbSearchPositions.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TBLOCAL_SEARCH_POSITIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.DSDD_Stammdaten, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).EndInit() @@ -960,13 +1409,37 @@ Partial Class frmAdmin_CWProfile CType(Me.LayoutControlItem17, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem18, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem19, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem21, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridViewDocSearch, System.ComponentModel.ISupportInitialize).EndInit() Me.PageDataSearch.ResumeLayout(False) CType(Me.LayoutControlDataSearch, System.ComponentModel.ISupportInitialize).EndInit() + Me.LayoutControlDataSearch.ResumeLayout(False) + CType(Me.TextEdit51.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TBCW_PROF_DATA_SEARCHBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextEdit61.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.cmbSearchPositions1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.CheckEdit21.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextEdit71.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextEdit81.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtAddedWho11.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtChangedWho11.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtAddedWhen11.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtChangedWhen11.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ComboBoxEdit11.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem22, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem23, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem26, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem27, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem32, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem28, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem29, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem30, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem31, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem24, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem25, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TBCW_PROF_DATA_SEARCHBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridViewDataSearch, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -1018,7 +1491,6 @@ Partial Class frmAdmin_CWProfile Friend WithEvents LayoutControlItem10 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents TextEdit6 As DevExpress.XtraEditors.TextEdit Friend WithEvents CheckEdit2 As DevExpress.XtraEditors.CheckEdit - Friend WithEvents ComboBoxEdit1 As DevExpress.XtraEditors.ComboBoxEdit Friend WithEvents LayoutControlItem11 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem13 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem12 As DevExpress.XtraLayout.LayoutControlItem @@ -1047,4 +1519,37 @@ Partial Class frmAdmin_CWProfile Friend WithEvents LayoutControlDataSearch As DevExpress.XtraLayout.LayoutControl Friend WithEvents LayoutControlGroup2 As DevExpress.XtraLayout.LayoutControlGroup Friend WithEvents BarButtonNew As DevExpress.XtraBars.BarButtonItem + Friend WithEvents LayoutControlItem20 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents cmbProfileType As DevExpress.XtraEditors.LookUpEdit + Friend WithEvents cmbSearchPositions As DevExpress.XtraEditors.LookUpEdit + Friend WithEvents TBLOCAL_PROFILE_TYPEBindingSource As BindingSource + Friend WithEvents TBLOCAL_SEARCH_POSITIONBindingSource As BindingSource + Friend WithEvents ComboBoxEdit1 As DevExpress.XtraEditors.LookUpEdit + Friend WithEvents LayoutControlItem21 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents DSDD_Stammdaten As DSDD_Stammdaten + Friend WithEvents TBDD_CONNECTIONBindingSource As BindingSource + Friend WithEvents TBDD_CONNECTIONTableAdapter As DSDD_StammdatenTableAdapters.TBDD_CONNECTIONTableAdapter + Friend WithEvents TableAdapterManager1 As DSDD_StammdatenTableAdapters.TableAdapterManager + Friend WithEvents TextEdit51 As DevExpress.XtraEditors.TextEdit + Friend WithEvents TextEdit61 As DevExpress.XtraEditors.TextEdit + Friend WithEvents cmbSearchPositions1 As DevExpress.XtraEditors.LookUpEdit + Friend WithEvents CheckEdit21 As DevExpress.XtraEditors.CheckEdit + Friend WithEvents TextEdit71 As DevExpress.XtraEditors.ButtonEdit + Friend WithEvents TextEdit81 As DevExpress.XtraEditors.ButtonEdit + Friend WithEvents txtAddedWho11 As DevExpress.XtraEditors.TextEdit + Friend WithEvents txtChangedWho11 As DevExpress.XtraEditors.TextEdit + Friend WithEvents txtAddedWhen11 As DevExpress.XtraEditors.TextEdit + Friend WithEvents txtChangedWhen11 As DevExpress.XtraEditors.TextEdit + Friend WithEvents ComboBoxEdit11 As DevExpress.XtraEditors.LookUpEdit + Friend WithEvents LayoutControlItem22 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem23 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem24 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem25 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem26 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem27 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem28 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem29 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem30 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem31 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem32 As DevExpress.XtraLayout.LayoutControlItem End Class diff --git a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.resx b/GUIs.ZooFlow/Administration/frmAdmin_ClipboardWatcher.resx similarity index 83% rename from GUIs.ZooFlow/Administration/frmAdmin_CWProfile.resx rename to GUIs.ZooFlow/Administration/frmAdmin_ClipboardWatcher.resx index a80e47af..6657b310 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.resx +++ b/GUIs.ZooFlow/Administration/frmAdmin_ClipboardWatcher.resx @@ -129,9 +129,21 @@ 612, 17 + + 295, 56 + 785, 17 + + 557, 56 + + + 1006, 56 + + + 847, 56 + 1336, 17 @@ -141,4 +153,13 @@ 17, 56 + + 1250, 56 + + + 17, 95 + + + 119 + \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb b/GUIs.ZooFlow/Administration/frmAdmin_ClipboardWatcher.vb similarity index 66% rename from GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb rename to GUIs.ZooFlow/Administration/frmAdmin_ClipboardWatcher.vb index edb9cdc1..0d1da274 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_ClipboardWatcher.vb @@ -1,5 +1,6 @@ Imports System.ComponentModel Imports DevExpress.XtraEditors +Imports DevExpress.XtraEditors.Controls Imports DevExpress.XtraGrid.Views.Grid Imports DevExpress.XtraLayout Imports DevExpress.XtraTab @@ -8,7 +9,7 @@ Imports DigitalData.Controls.SQLEditor Imports DigitalData.GUIs.Common Imports DigitalData.Modules.Logging -Public Class frmAdmin_CWProfile +Public Class frmAdmin_ClipboardWatcher Implements IAdminForm Public Property PrimaryKey As Integer Implements IAdminForm.PrimaryKey @@ -23,8 +24,34 @@ Public Class frmAdmin_CWProfile Private Const TAB_PAGE_DOCSEARCH = "TAB_PAGE_DOCSEARCH" Private Const TAB_PAGE_DATASEARCH = "TAB_PAGE_DATASEARCH" + Private Const SEARCH_POSITION_PRIMARY As Integer = 0 + Private Const SEARCH_POSITION_SECONDARY As Integer = 1 + Private Const SEARCH_POSITION_TERTIARY As Integer = 2 + + Private Const PROFILE_TYPE_DATA_DOCS As Integer = 0 + Private Const PROFILE_TYPE_DOCS_ONLY As Integer = 1 + Private Const PROFILE_TYPE_DATA_ONLY As Integer = 2 + Private Pages As ClassDetailPages + Friend Class ProfileType + Public Property Id As Integer + Public Property Name As String + + Public Overrides Function ToString() As String + Return Name + End Function + End Class + + Friend Class SearchPosition + Public Property Id As Integer + Public Property Name As String + + Public Overrides Function ToString() As String + Return Name + End Function + End Class + Public Sub New(PrimaryKey As Integer) MyBase.New(My.LogConfig) @@ -37,6 +64,8 @@ Public Class frmAdmin_CWProfile End Sub Private Sub frmAdmin_CWProfile_Load(sender As Object, e As EventArgs) Handles Me.Load + 'TODO: Diese Codezeile lädt Daten in die Tabelle "DSDD_Stammdaten.TBDD_CONNECTION". Sie können sie bei Bedarf verschieben oder entfernen. + Me.TBDD_CONNECTIONTableAdapter.Fill(Me.DSDD_Stammdaten.TBDD_CONNECTION) Try TBCW_PROFILESTableAdapter.Connection.ConnectionString = My.Database.CurrentSQLConnectionString TBCW_PROFILESTableAdapter.Fill(DBCW_Stammdaten.TBCW_PROFILES, PrimaryKey) @@ -47,6 +76,9 @@ Public Class frmAdmin_CWProfile TBCW_PROF_DATA_SEARCHTableAdapter.Connection.ConnectionString = My.Database.CurrentSQLConnectionString TBCW_PROF_DATA_SEARCHTableAdapter.Fill(DBCW_Stammdaten.TBCW_PROF_DATA_SEARCH, PrimaryKey) + TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = My.Database.CurrentSQLConnectionString + TBDD_CONNECTIONTableAdapter.Fill(DSDD_Stammdaten.TBDD_CONNECTION) + ' Configure the GridViews with some default options Dim oViews As New List(Of GridView) From {GridViewDataSearch, GridViewDocSearch} Dim oGridBuilder As New GridBuilder(oViews) @@ -57,10 +89,17 @@ Public Class frmAdmin_CWProfile ' Add Focus Handler to all controls in all LayoutControls Dim oLayoutControls = New List(Of LayoutControl) From {LayoutControlProfile, LayoutControlDocSearch, LayoutControlDataSearch} - Pages = New ClassDetailPages(oLayoutControls) + DBCW_Stammdaten.TBLOCAL_SEARCH_POSITION.Rows.Add(SEARCH_POSITION_PRIMARY, "Haupttabelle") + DBCW_Stammdaten.TBLOCAL_SEARCH_POSITION.Rows.Add(SEARCH_POSITION_SECONDARY, "Erste Detailtabelle") + DBCW_Stammdaten.TBLOCAL_SEARCH_POSITION.Rows.Add(SEARCH_POSITION_TERTIARY, "Zweite Detailtabelle") + + DBCW_Stammdaten.TBLOCAL_PROFILE_TYPE.Rows.Add(PROFILE_TYPE_DATA_DOCS, "Dokumente und Daten") + DBCW_Stammdaten.TBLOCAL_PROFILE_TYPE.Rows.Add(PROFILE_TYPE_DOCS_ONLY, "Nur Dokumente") + DBCW_Stammdaten.TBLOCAL_PROFILE_TYPE.Rows.Add(PROFILE_TYPE_DATA_ONLY, "Nur Daten") + + Pages = New ClassDetailPages(My.LogConfig, Me, oLayoutControls) Pages.AddRange({ - New ClassDetailPages.DetailPage With { - .IsPrimary = True, + New ClassDetailPages.PrimaryPage(IsInsert) With { .Name = "Profil", .TabPage = PageProfile, .BindingSource = TBCW_PROFILESBindingSource, @@ -80,18 +119,19 @@ Public Class frmAdmin_CWProfile .Name = "Daten-Suche", .TabPage = PageDataSearch, .BindingSource = TBCW_PROF_DATA_SEARCHBindingSource, - .DataTable = DBCW_Stammdaten.TBCW_PROF_DATA_SEARCH + .DataTable = DBCW_Stammdaten.TBCW_PROF_DATA_SEARCH, + .AddedWhoEdit = txtAddedWho11, + .ChangedWhoEdit = txtChangedWho11 } }) - AddHandler Pages.AnyControl_Focus, AddressOf AnyControl_Focus - AddHandler Pages.AnyControl_Changed, AddressOf AnyControl_Changed + AddHandler Pages.CurrentPage_Changed, AddressOf CurrentPage_Changed Catch ex As Exception ShowErrorMessage(ex) End Try End Sub - Private Sub AnyControl_Focus(sender As Object, e As ClassDetailPages.DetailPageEventArgs) + Private Sub CurrentPage_Changed(sender As Object, e As ClassDetailPages.DetailPageEventArgs) If Not IsNothing(e.Page) Then If e.Page.IsPrimary = True Then BarButtonNew.Enabled = False @@ -103,10 +143,6 @@ Public Class frmAdmin_CWProfile End If End Sub - Private Sub AnyControl_Changed(sender As Object, e As ClassDetailPages.DetailPageEventArgs) - - End Sub - Private Sub ResetMessages() labelStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.Never End Sub @@ -116,53 +152,26 @@ Public Class frmAdmin_CWProfile labelStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.Always End Sub - - - Public Function SaveData() As Boolean Implements IAdminForm.SaveData - If Pages.CurrentPage Is Nothing Then - Return False - End If - - Dim oPage = Pages.CurrentPage - - Try - oPage.BindingSource.EndEdit() - - If oPage.DataTable.GetChanges() IsNot Nothing Then - HasChanges = True - - If IsInsert Then - oPage.AddedWhoEdit.EditValue = My.Application.User.UserName - Else - oPage.ChangedWhoEdit.EditValue = My.Application.User.UserName - End If - - oPage.BindingSource.EndEdit() - Return True - Else - HasChanges = False - End If - - Return False - Catch ex As Exception - ShowErrorMessage(ex) - Return False - End Try - End Function - Private Sub BarButtonSave_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonSave.ItemClick ResetMessages() - If SaveData() And HasChanges Then - Select Case Pages.CurrentPage.TabPage.Name + If Pages.PrepareSave() = True Then + Dim oPage = Pages.Current + + Select Case oPage.TabPage.Name Case PageProfile.Name - TBCW_PROFILESTableAdapter.Update(Pages.CurrentPage.DataTable) + TBCW_PROFILESTableAdapter.Update(oPage.DataTable) Case PageDocumentSearch.Name - TBCW_PROF_DOC_SEARCHTableAdapter.Update(Pages.CurrentPage.DataTable) + TBCW_PROF_DOC_SEARCHTableAdapter.Update(oPage.DataTable) + + Case PageDataSearch.Name + TBCW_PROF_DATA_SEARCHTableAdapter.Update(oPage.DataTable) End Select - ShowStatus($"{Pages.CurrentPage.Name} gespeichert!") + oPage.IsInsert = False + + ShowStatus($"{oPage.Name} gespeichert!") End If End Sub @@ -171,13 +180,16 @@ Public Class frmAdmin_CWProfile End Function Public Function AddData() As Boolean - If Pages.CurrentPage Is Nothing Then + Dim oPage = Pages.Current + + If Pages.Current Is Nothing Then Return False End If - Dim oPage = Pages.CurrentPage + If oPage.IsPrimary = False Then + oPage.DataTable.Columns.Item("PROFILE_ID").DefaultValue = PrimaryKey + End If - oPage.DataTable.Columns.Item("PROFILE_ID").DefaultValue = PrimaryKey Dim oNewRecord As DataRowView = oPage.BindingSource.AddNew() Return True @@ -223,6 +235,16 @@ Public Class frmAdmin_CWProfile End Sub Private Sub BarButtonNew_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonNew.ItemClick + Pages.Current.IsInsert = True + AddData() End Sub + + Private Sub XtraTabControl2_SelectedPageChanged(sender As Object, e As TabPageChangedEventArgs) Handles XtraTabControl2.SelectedPageChanged + Dim oPage = Pages.GetDetailPage(e.Page) + + If oPage IsNot Nothing Then + Pages.Current = oPage + End If + End Sub End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb index 20bfba87..f48830c4 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb @@ -193,7 +193,6 @@ Public Class frmAdmin_Start 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 diff --git a/GUIs.ZooFlow/DBCW_Stammdaten.Designer.vb b/GUIs.ZooFlow/DBCW_Stammdaten.Designer.vb index 350e5fc8..0e36e85a 100644 --- a/GUIs.ZooFlow/DBCW_Stammdaten.Designer.vb +++ b/GUIs.ZooFlow/DBCW_Stammdaten.Designer.vb @@ -31,6 +31,10 @@ Partial Public Class DBCW_Stammdaten Private tableTBCW_PROF_DATA_SEARCH As TBCW_PROF_DATA_SEARCHDataTable + Private tableTBLOCAL_SEARCH_POSITION As TBLOCAL_SEARCH_POSITIONDataTable + + Private tableTBLOCAL_PROFILE_TYPE As TBLOCAL_PROFILE_TYPEDataTable + Private relationFK_TBCW_PROF_DOC_SEARCH_PROF_IF As Global.System.Data.DataRelation Private relationFK_TBCW_PROF_DATA_SEARCH_PROF_IF As Global.System.Data.DataRelation @@ -73,6 +77,12 @@ Partial Public Class DBCW_Stammdaten If (Not (ds.Tables("TBCW_PROF_DATA_SEARCH")) Is Nothing) Then MyBase.Tables.Add(New TBCW_PROF_DATA_SEARCHDataTable(ds.Tables("TBCW_PROF_DATA_SEARCH"))) End If + If (Not (ds.Tables("TBLOCAL_SEARCH_POSITION")) Is Nothing) Then + MyBase.Tables.Add(New TBLOCAL_SEARCH_POSITIONDataTable(ds.Tables("TBLOCAL_SEARCH_POSITION"))) + End If + If (Not (ds.Tables("TBLOCAL_PROFILE_TYPE")) Is Nothing) Then + MyBase.Tables.Add(New TBLOCAL_PROFILE_TYPEDataTable(ds.Tables("TBLOCAL_PROFILE_TYPE"))) + End If Me.DataSetName = ds.DataSetName Me.Prefix = ds.Prefix Me.Namespace = ds.Namespace @@ -120,6 +130,26 @@ Partial Public Class DBCW_Stammdaten End Get End Property + _ + Public ReadOnly Property TBLOCAL_SEARCH_POSITION() As TBLOCAL_SEARCH_POSITIONDataTable + Get + Return Me.tableTBLOCAL_SEARCH_POSITION + End Get + End Property + + _ + Public ReadOnly Property TBLOCAL_PROFILE_TYPE() As TBLOCAL_PROFILE_TYPEDataTable + Get + Return Me.tableTBLOCAL_PROFILE_TYPE + End Get + End Property + _ + Private Function ShouldSerializeTBLOCAL_SEARCH_POSITION() As Boolean + Return false + End Function + + _ + Private Function ShouldSerializeTBLOCAL_PROFILE_TYPE() As Boolean + Return false + End Function + _ Private Sub SchemaChanged(ByVal sender As Object, ByVal e As Global.System.ComponentModel.CollectionChangeEventArgs) @@ -355,6 +419,12 @@ Partial Public Class DBCW_Stammdaten _ Public Delegate Sub TBCW_PROF_DATA_SEARCHRowChangeEventHandler(ByVal sender As Object, ByVal e As TBCW_PROF_DATA_SEARCHRowChangeEvent) + _ + Public Delegate Sub TBLOCAL_SEARCH_POSITIONRowChangeEventHandler(ByVal sender As Object, ByVal e As TBLOCAL_SEARCH_POSITIONRowChangeEvent) + + _ + Public Delegate Sub TBLOCAL_PROFILE_TYPERowChangeEventHandler(ByVal sender As Object, ByVal e As TBLOCAL_PROFILE_TYPERowChangeEvent) + ''' '''Represents the strongly named DataTable class. ''' @@ -610,10 +680,10 @@ Partial Public Class DBCW_Stammdaten Me.columnGUID.Unique = true Me.columnNAME.AllowDBNull = false Me.columnNAME.MaxLength = 100 + Me.columnCOMMENT.AllowDBNull = false Me.columnCOMMENT.MaxLength = 500 Me.columnREGEX_EXPRESSION.AllowDBNull = false Me.columnREGEX_EXPRESSION.MaxLength = 100 - Me.columnADDED_WHO.AllowDBNull = false Me.columnADDED_WHO.MaxLength = 50 Me.columnCHANGED_WHO.MaxLength = 50 Me.columnACTIVE.AllowDBNull = false @@ -1037,9 +1107,9 @@ Partial Public Class DBCW_Stammdaten Me.columnACTIVE.AllowDBNull = false Me.columnTAB_TITLE.AllowDBNull = false Me.columnTAB_TITLE.MaxLength = 100 - Me.columnADDED_WHO.AllowDBNull = false Me.columnADDED_WHO.MaxLength = 50 Me.columnCHANGED_WHO.MaxLength = 50 + Me.columnCOUNT_COMMAND.AllowDBNull = false Me.columnCOUNT_COMMAND.MaxLength = 2147483647 End Sub @@ -1460,7 +1530,6 @@ Partial Public Class DBCW_Stammdaten Me.columnACTIVE.AllowDBNull = false Me.columnTAB_TITLE.AllowDBNull = false Me.columnTAB_TITLE.MaxLength = 100 - Me.columnADDED_WHO.AllowDBNull = false Me.columnADDED_WHO.MaxLength = 50 Me.columnCHANGED_WHO.MaxLength = 50 Me.columnCOUNT_COMMAND.AllowDBNull = false @@ -1469,28 +1538,558 @@ Partial Public Class DBCW_Stammdaten _ - Public Function NewTBCW_PROF_DATA_SEARCHRow() As TBCW_PROF_DATA_SEARCHRow - Return CType(Me.NewRow,TBCW_PROF_DATA_SEARCHRow) + Public Function NewTBCW_PROF_DATA_SEARCHRow() As TBCW_PROF_DATA_SEARCHRow + Return CType(Me.NewRow,TBCW_PROF_DATA_SEARCHRow) + End Function + + _ + Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow + Return New TBCW_PROF_DATA_SEARCHRow(builder) + End Function + + _ + Protected Overrides Function GetRowType() As Global.System.Type + Return GetType(TBCW_PROF_DATA_SEARCHRow) + End Function + + _ + Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowChanged(e) + If (Not (Me.TBCW_PROF_DATA_SEARCHRowChangedEvent) Is Nothing) Then + RaiseEvent TBCW_PROF_DATA_SEARCHRowChanged(Me, New TBCW_PROF_DATA_SEARCHRowChangeEvent(CType(e.Row,TBCW_PROF_DATA_SEARCHRow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowChanging(e) + If (Not (Me.TBCW_PROF_DATA_SEARCHRowChangingEvent) Is Nothing) Then + RaiseEvent TBCW_PROF_DATA_SEARCHRowChanging(Me, New TBCW_PROF_DATA_SEARCHRowChangeEvent(CType(e.Row,TBCW_PROF_DATA_SEARCHRow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowDeleted(e) + If (Not (Me.TBCW_PROF_DATA_SEARCHRowDeletedEvent) Is Nothing) Then + RaiseEvent TBCW_PROF_DATA_SEARCHRowDeleted(Me, New TBCW_PROF_DATA_SEARCHRowChangeEvent(CType(e.Row,TBCW_PROF_DATA_SEARCHRow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowDeleting(e) + If (Not (Me.TBCW_PROF_DATA_SEARCHRowDeletingEvent) Is Nothing) Then + RaiseEvent TBCW_PROF_DATA_SEARCHRowDeleting(Me, New TBCW_PROF_DATA_SEARCHRowChangeEvent(CType(e.Row,TBCW_PROF_DATA_SEARCHRow), e.Action)) + End If + End Sub + + _ + Public Sub RemoveTBCW_PROF_DATA_SEARCHRow(ByVal row As TBCW_PROF_DATA_SEARCHRow) + Me.Rows.Remove(row) + End Sub + + _ + Public Shared Function GetTypedTableSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType + Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() + Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence() + Dim ds As DBCW_Stammdaten = New DBCW_Stammdaten() + Dim any1 As Global.System.Xml.Schema.XmlSchemaAny = New Global.System.Xml.Schema.XmlSchemaAny() + any1.Namespace = "http://www.w3.org/2001/XMLSchema" + any1.MinOccurs = New Decimal(0) + any1.MaxOccurs = Decimal.MaxValue + any1.ProcessContents = Global.System.Xml.Schema.XmlSchemaContentProcessing.Lax + sequence.Items.Add(any1) + Dim any2 As Global.System.Xml.Schema.XmlSchemaAny = New Global.System.Xml.Schema.XmlSchemaAny() + any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1" + any2.MinOccurs = New Decimal(1) + any2.ProcessContents = Global.System.Xml.Schema.XmlSchemaContentProcessing.Lax + sequence.Items.Add(any2) + Dim attribute1 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() + attribute1.Name = "namespace" + attribute1.FixedValue = ds.Namespace + type.Attributes.Add(attribute1) + Dim attribute2 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() + attribute2.Name = "tableTypeName" + attribute2.FixedValue = "TBCW_PROF_DATA_SEARCHDataTable" + type.Attributes.Add(attribute2) + type.Particle = sequence + Dim dsSchema As Global.System.Xml.Schema.XmlSchema = ds.GetSchemaSerializable + If xs.Contains(dsSchema.TargetNamespace) Then + Dim s1 As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream() + Dim s2 As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream() + Try + Dim schema As Global.System.Xml.Schema.XmlSchema = Nothing + dsSchema.Write(s1) + Dim schemas As Global.System.Collections.IEnumerator = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator + Do While schemas.MoveNext + schema = CType(schemas.Current,Global.System.Xml.Schema.XmlSchema) + s2.SetLength(0) + schema.Write(s2) + If (s1.Length = s2.Length) Then + s1.Position = 0 + s2.Position = 0 + + Do While ((s1.Position <> s1.Length) _ + AndAlso (s1.ReadByte = s2.ReadByte)) + + + Loop + If (s1.Position = s1.Length) Then + Return type + End If + End If + + Loop + Finally + If (Not (s1) Is Nothing) Then + s1.Close + End If + If (Not (s2) Is Nothing) Then + s2.Close + End If + End Try + End If + xs.Add(dsSchema) + Return type + End Function + End Class + + ''' + '''Represents the strongly named DataTable class. + ''' + _ + Partial Public Class TBLOCAL_SEARCH_POSITIONDataTable + Inherits Global.System.Data.TypedTableBase(Of TBLOCAL_SEARCH_POSITIONRow) + + Private columnID As Global.System.Data.DataColumn + + Private columnNAME As Global.System.Data.DataColumn + + _ + Public Sub New() + MyBase.New + Me.TableName = "TBLOCAL_SEARCH_POSITION" + Me.BeginInit + Me.InitClass + Me.EndInit + End Sub + + _ + Friend Sub New(ByVal table As Global.System.Data.DataTable) + MyBase.New + Me.TableName = table.TableName + If (table.CaseSensitive <> table.DataSet.CaseSensitive) Then + Me.CaseSensitive = table.CaseSensitive + End If + If (table.Locale.ToString <> table.DataSet.Locale.ToString) Then + Me.Locale = table.Locale + End If + If (table.Namespace <> table.DataSet.Namespace) Then + Me.Namespace = table.Namespace + End If + Me.Prefix = table.Prefix + Me.MinimumCapacity = table.MinimumCapacity + End Sub + + _ + Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) + MyBase.New(info, context) + Me.InitVars + End Sub + + _ + Public ReadOnly Property IDColumn() As Global.System.Data.DataColumn + Get + Return Me.columnID + End Get + End Property + + _ + Public ReadOnly Property NAMEColumn() As Global.System.Data.DataColumn + Get + Return Me.columnNAME + End Get + End Property + + _ + Public ReadOnly Property Count() As Integer + Get + Return Me.Rows.Count + End Get + End Property + + _ + Public Default ReadOnly Property Item(ByVal index As Integer) As TBLOCAL_SEARCH_POSITIONRow + Get + Return CType(Me.Rows(index),TBLOCAL_SEARCH_POSITIONRow) + End Get + End Property + + _ + Public Event TBLOCAL_SEARCH_POSITIONRowChanging As TBLOCAL_SEARCH_POSITIONRowChangeEventHandler + + _ + Public Event TBLOCAL_SEARCH_POSITIONRowChanged As TBLOCAL_SEARCH_POSITIONRowChangeEventHandler + + _ + Public Event TBLOCAL_SEARCH_POSITIONRowDeleting As TBLOCAL_SEARCH_POSITIONRowChangeEventHandler + + _ + Public Event TBLOCAL_SEARCH_POSITIONRowDeleted As TBLOCAL_SEARCH_POSITIONRowChangeEventHandler + + _ + Public Overloads Sub AddTBLOCAL_SEARCH_POSITIONRow(ByVal row As TBLOCAL_SEARCH_POSITIONRow) + Me.Rows.Add(row) + End Sub + + _ + Public Overloads Function AddTBLOCAL_SEARCH_POSITIONRow(ByVal ID As String, ByVal NAME As String) As TBLOCAL_SEARCH_POSITIONRow + Dim rowTBLOCAL_SEARCH_POSITIONRow As TBLOCAL_SEARCH_POSITIONRow = CType(Me.NewRow,TBLOCAL_SEARCH_POSITIONRow) + Dim columnValuesArray() As Object = New Object() {ID, NAME} + rowTBLOCAL_SEARCH_POSITIONRow.ItemArray = columnValuesArray + Me.Rows.Add(rowTBLOCAL_SEARCH_POSITIONRow) + Return rowTBLOCAL_SEARCH_POSITIONRow + End Function + + _ + Public Overrides Function Clone() As Global.System.Data.DataTable + Dim cln As TBLOCAL_SEARCH_POSITIONDataTable = CType(MyBase.Clone,TBLOCAL_SEARCH_POSITIONDataTable) + cln.InitVars + Return cln + End Function + + _ + Protected Overrides Function CreateInstance() As Global.System.Data.DataTable + Return New TBLOCAL_SEARCH_POSITIONDataTable() + End Function + + _ + Friend Sub InitVars() + Me.columnID = MyBase.Columns("ID") + Me.columnNAME = MyBase.Columns("NAME") + End Sub + + _ + Private Sub InitClass() + Me.columnID = New Global.System.Data.DataColumn("ID", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnID) + Me.columnNAME = New Global.System.Data.DataColumn("NAME", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnNAME) + End Sub + + _ + Public Function NewTBLOCAL_SEARCH_POSITIONRow() As TBLOCAL_SEARCH_POSITIONRow + Return CType(Me.NewRow,TBLOCAL_SEARCH_POSITIONRow) + End Function + + _ + Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow + Return New TBLOCAL_SEARCH_POSITIONRow(builder) + End Function + + _ + Protected Overrides Function GetRowType() As Global.System.Type + Return GetType(TBLOCAL_SEARCH_POSITIONRow) + End Function + + _ + Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowChanged(e) + If (Not (Me.TBLOCAL_SEARCH_POSITIONRowChangedEvent) Is Nothing) Then + RaiseEvent TBLOCAL_SEARCH_POSITIONRowChanged(Me, New TBLOCAL_SEARCH_POSITIONRowChangeEvent(CType(e.Row,TBLOCAL_SEARCH_POSITIONRow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowChanging(e) + If (Not (Me.TBLOCAL_SEARCH_POSITIONRowChangingEvent) Is Nothing) Then + RaiseEvent TBLOCAL_SEARCH_POSITIONRowChanging(Me, New TBLOCAL_SEARCH_POSITIONRowChangeEvent(CType(e.Row,TBLOCAL_SEARCH_POSITIONRow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowDeleted(e) + If (Not (Me.TBLOCAL_SEARCH_POSITIONRowDeletedEvent) Is Nothing) Then + RaiseEvent TBLOCAL_SEARCH_POSITIONRowDeleted(Me, New TBLOCAL_SEARCH_POSITIONRowChangeEvent(CType(e.Row,TBLOCAL_SEARCH_POSITIONRow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowDeleting(e) + If (Not (Me.TBLOCAL_SEARCH_POSITIONRowDeletingEvent) Is Nothing) Then + RaiseEvent TBLOCAL_SEARCH_POSITIONRowDeleting(Me, New TBLOCAL_SEARCH_POSITIONRowChangeEvent(CType(e.Row,TBLOCAL_SEARCH_POSITIONRow), e.Action)) + End If + End Sub + + _ + Public Sub RemoveTBLOCAL_SEARCH_POSITIONRow(ByVal row As TBLOCAL_SEARCH_POSITIONRow) + Me.Rows.Remove(row) + End Sub + + _ + Public Shared Function GetTypedTableSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType + Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() + Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence() + Dim ds As DBCW_Stammdaten = New DBCW_Stammdaten() + Dim any1 As Global.System.Xml.Schema.XmlSchemaAny = New Global.System.Xml.Schema.XmlSchemaAny() + any1.Namespace = "http://www.w3.org/2001/XMLSchema" + any1.MinOccurs = New Decimal(0) + any1.MaxOccurs = Decimal.MaxValue + any1.ProcessContents = Global.System.Xml.Schema.XmlSchemaContentProcessing.Lax + sequence.Items.Add(any1) + Dim any2 As Global.System.Xml.Schema.XmlSchemaAny = New Global.System.Xml.Schema.XmlSchemaAny() + any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1" + any2.MinOccurs = New Decimal(1) + any2.ProcessContents = Global.System.Xml.Schema.XmlSchemaContentProcessing.Lax + sequence.Items.Add(any2) + Dim attribute1 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() + attribute1.Name = "namespace" + attribute1.FixedValue = ds.Namespace + type.Attributes.Add(attribute1) + Dim attribute2 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() + attribute2.Name = "tableTypeName" + attribute2.FixedValue = "TBLOCAL_SEARCH_POSITIONDataTable" + type.Attributes.Add(attribute2) + type.Particle = sequence + Dim dsSchema As Global.System.Xml.Schema.XmlSchema = ds.GetSchemaSerializable + If xs.Contains(dsSchema.TargetNamespace) Then + Dim s1 As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream() + Dim s2 As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream() + Try + Dim schema As Global.System.Xml.Schema.XmlSchema = Nothing + dsSchema.Write(s1) + Dim schemas As Global.System.Collections.IEnumerator = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator + Do While schemas.MoveNext + schema = CType(schemas.Current,Global.System.Xml.Schema.XmlSchema) + s2.SetLength(0) + schema.Write(s2) + If (s1.Length = s2.Length) Then + s1.Position = 0 + s2.Position = 0 + + Do While ((s1.Position <> s1.Length) _ + AndAlso (s1.ReadByte = s2.ReadByte)) + + + Loop + If (s1.Position = s1.Length) Then + Return type + End If + End If + + Loop + Finally + If (Not (s1) Is Nothing) Then + s1.Close + End If + If (Not (s2) Is Nothing) Then + s2.Close + End If + End Try + End If + xs.Add(dsSchema) + Return type + End Function + End Class + + ''' + '''Represents the strongly named DataTable class. + ''' + _ + Partial Public Class TBLOCAL_PROFILE_TYPEDataTable + Inherits Global.System.Data.TypedTableBase(Of TBLOCAL_PROFILE_TYPERow) + + Private columnID As Global.System.Data.DataColumn + + Private columnNAME As Global.System.Data.DataColumn + + _ + Public Sub New() + MyBase.New + Me.TableName = "TBLOCAL_PROFILE_TYPE" + Me.BeginInit + Me.InitClass + Me.EndInit + End Sub + + _ + Friend Sub New(ByVal table As Global.System.Data.DataTable) + MyBase.New + Me.TableName = table.TableName + If (table.CaseSensitive <> table.DataSet.CaseSensitive) Then + Me.CaseSensitive = table.CaseSensitive + End If + If (table.Locale.ToString <> table.DataSet.Locale.ToString) Then + Me.Locale = table.Locale + End If + If (table.Namespace <> table.DataSet.Namespace) Then + Me.Namespace = table.Namespace + End If + Me.Prefix = table.Prefix + Me.MinimumCapacity = table.MinimumCapacity + End Sub + + _ + Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) + MyBase.New(info, context) + Me.InitVars + End Sub + + _ + Public ReadOnly Property IDColumn() As Global.System.Data.DataColumn + Get + Return Me.columnID + End Get + End Property + + _ + Public ReadOnly Property NAMEColumn() As Global.System.Data.DataColumn + Get + Return Me.columnNAME + End Get + End Property + + _ + Public ReadOnly Property Count() As Integer + Get + Return Me.Rows.Count + End Get + End Property + + _ + Public Default ReadOnly Property Item(ByVal index As Integer) As TBLOCAL_PROFILE_TYPERow + Get + Return CType(Me.Rows(index),TBLOCAL_PROFILE_TYPERow) + End Get + End Property + + _ + Public Event TBLOCAL_PROFILE_TYPERowChanging As TBLOCAL_PROFILE_TYPERowChangeEventHandler + + _ + Public Event TBLOCAL_PROFILE_TYPERowChanged As TBLOCAL_PROFILE_TYPERowChangeEventHandler + + _ + Public Event TBLOCAL_PROFILE_TYPERowDeleting As TBLOCAL_PROFILE_TYPERowChangeEventHandler + + _ + Public Event TBLOCAL_PROFILE_TYPERowDeleted As TBLOCAL_PROFILE_TYPERowChangeEventHandler + + _ + Public Overloads Sub AddTBLOCAL_PROFILE_TYPERow(ByVal row As TBLOCAL_PROFILE_TYPERow) + Me.Rows.Add(row) + End Sub + + _ + Public Overloads Function AddTBLOCAL_PROFILE_TYPERow(ByVal ID As String, ByVal NAME As String) As TBLOCAL_PROFILE_TYPERow + Dim rowTBLOCAL_PROFILE_TYPERow As TBLOCAL_PROFILE_TYPERow = CType(Me.NewRow,TBLOCAL_PROFILE_TYPERow) + Dim columnValuesArray() As Object = New Object() {ID, NAME} + rowTBLOCAL_PROFILE_TYPERow.ItemArray = columnValuesArray + Me.Rows.Add(rowTBLOCAL_PROFILE_TYPERow) + Return rowTBLOCAL_PROFILE_TYPERow + End Function + + _ + Public Overrides Function Clone() As Global.System.Data.DataTable + Dim cln As TBLOCAL_PROFILE_TYPEDataTable = CType(MyBase.Clone,TBLOCAL_PROFILE_TYPEDataTable) + cln.InitVars + Return cln + End Function + + _ + Protected Overrides Function CreateInstance() As Global.System.Data.DataTable + Return New TBLOCAL_PROFILE_TYPEDataTable() + End Function + + _ + Friend Sub InitVars() + Me.columnID = MyBase.Columns("ID") + Me.columnNAME = MyBase.Columns("NAME") + End Sub + + _ + Private Sub InitClass() + Me.columnID = New Global.System.Data.DataColumn("ID", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnID) + Me.columnNAME = New Global.System.Data.DataColumn("NAME", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnNAME) + End Sub + + _ + Public Function NewTBLOCAL_PROFILE_TYPERow() As TBLOCAL_PROFILE_TYPERow + Return CType(Me.NewRow,TBLOCAL_PROFILE_TYPERow) End Function _ Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow - Return New TBCW_PROF_DATA_SEARCHRow(builder) + Return New TBLOCAL_PROFILE_TYPERow(builder) End Function _ Protected Overrides Function GetRowType() As Global.System.Type - Return GetType(TBCW_PROF_DATA_SEARCHRow) + Return GetType(TBLOCAL_PROFILE_TYPERow) End Function _ Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanged(e) - If (Not (Me.TBCW_PROF_DATA_SEARCHRowChangedEvent) Is Nothing) Then - RaiseEvent TBCW_PROF_DATA_SEARCHRowChanged(Me, New TBCW_PROF_DATA_SEARCHRowChangeEvent(CType(e.Row,TBCW_PROF_DATA_SEARCHRow), e.Action)) + If (Not (Me.TBLOCAL_PROFILE_TYPERowChangedEvent) Is Nothing) Then + RaiseEvent TBLOCAL_PROFILE_TYPERowChanged(Me, New TBLOCAL_PROFILE_TYPERowChangeEvent(CType(e.Row,TBLOCAL_PROFILE_TYPERow), e.Action)) End If End Sub @@ -1498,8 +2097,8 @@ Partial Public Class DBCW_Stammdaten Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanging(e) - If (Not (Me.TBCW_PROF_DATA_SEARCHRowChangingEvent) Is Nothing) Then - RaiseEvent TBCW_PROF_DATA_SEARCHRowChanging(Me, New TBCW_PROF_DATA_SEARCHRowChangeEvent(CType(e.Row,TBCW_PROF_DATA_SEARCHRow), e.Action)) + If (Not (Me.TBLOCAL_PROFILE_TYPERowChangingEvent) Is Nothing) Then + RaiseEvent TBLOCAL_PROFILE_TYPERowChanging(Me, New TBLOCAL_PROFILE_TYPERowChangeEvent(CType(e.Row,TBLOCAL_PROFILE_TYPERow), e.Action)) End If End Sub @@ -1507,8 +2106,8 @@ Partial Public Class DBCW_Stammdaten Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleted(e) - If (Not (Me.TBCW_PROF_DATA_SEARCHRowDeletedEvent) Is Nothing) Then - RaiseEvent TBCW_PROF_DATA_SEARCHRowDeleted(Me, New TBCW_PROF_DATA_SEARCHRowChangeEvent(CType(e.Row,TBCW_PROF_DATA_SEARCHRow), e.Action)) + If (Not (Me.TBLOCAL_PROFILE_TYPERowDeletedEvent) Is Nothing) Then + RaiseEvent TBLOCAL_PROFILE_TYPERowDeleted(Me, New TBLOCAL_PROFILE_TYPERowChangeEvent(CType(e.Row,TBLOCAL_PROFILE_TYPERow), e.Action)) End If End Sub @@ -1516,14 +2115,14 @@ Partial Public Class DBCW_Stammdaten Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleting(e) - If (Not (Me.TBCW_PROF_DATA_SEARCHRowDeletingEvent) Is Nothing) Then - RaiseEvent TBCW_PROF_DATA_SEARCHRowDeleting(Me, New TBCW_PROF_DATA_SEARCHRowChangeEvent(CType(e.Row,TBCW_PROF_DATA_SEARCHRow), e.Action)) + If (Not (Me.TBLOCAL_PROFILE_TYPERowDeletingEvent) Is Nothing) Then + RaiseEvent TBLOCAL_PROFILE_TYPERowDeleting(Me, New TBLOCAL_PROFILE_TYPERowChangeEvent(CType(e.Row,TBLOCAL_PROFILE_TYPERow), e.Action)) End If End Sub _ - Public Sub RemoveTBCW_PROF_DATA_SEARCHRow(ByVal row As TBCW_PROF_DATA_SEARCHRow) + Public Sub RemoveTBLOCAL_PROFILE_TYPERow(ByVal row As TBLOCAL_PROFILE_TYPERow) Me.Rows.Remove(row) End Sub @@ -1550,7 +2149,7 @@ Partial Public Class DBCW_Stammdaten type.Attributes.Add(attribute1) Dim attribute2 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() attribute2.Name = "tableTypeName" - attribute2.FixedValue = "TBCW_PROF_DATA_SEARCHDataTable" + attribute2.FixedValue = "TBLOCAL_PROFILE_TYPEDataTable" type.Attributes.Add(attribute2) type.Particle = sequence Dim dsSchema As Global.System.Xml.Schema.XmlSchema = ds.GetSchemaSerializable @@ -1635,11 +2234,7 @@ Partial Public Class DBCW_Stammdaten Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property COMMENT() As String Get - Try - Return CType(Me(Me.tableTBCW_PROFILES.COMMENTColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte COMMENT in Tabelle TBCW_PROFILES ist DBNull.", e) - End Try + Return CType(Me(Me.tableTBCW_PROFILES.COMMENTColumn),String) End Get Set Me(Me.tableTBCW_PROFILES.COMMENTColumn) = value @@ -1661,7 +2256,11 @@ Partial Public Class DBCW_Stammdaten Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ADDED_WHO() As String Get - Return CType(Me(Me.tableTBCW_PROFILES.ADDED_WHOColumn),String) + Try + Return CType(Me(Me.tableTBCW_PROFILES.ADDED_WHOColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ADDED_WHO in Tabelle TBCW_PROFILES ist DBNull.", e) + End Try End Get Set Me(Me.tableTBCW_PROFILES.ADDED_WHOColumn) = value @@ -1737,14 +2336,14 @@ Partial Public Class DBCW_Stammdaten _ - Public Function IsCOMMENTNull() As Boolean - Return Me.IsNull(Me.tableTBCW_PROFILES.COMMENTColumn) + Public Function IsADDED_WHONull() As Boolean + Return Me.IsNull(Me.tableTBCW_PROFILES.ADDED_WHOColumn) End Function _ - Public Sub SetCOMMENTNull() - Me(Me.tableTBCW_PROFILES.COMMENTColumn) = Global.System.Convert.DBNull + Public Sub SetADDED_WHONull() + Me(Me.tableTBCW_PROFILES.ADDED_WHOColumn) = Global.System.Convert.DBNull End Sub _ Public Property ADDED_WHO() As String Get - Return CType(Me(Me.tableTBCW_PROF_DOC_SEARCH.ADDED_WHOColumn),String) + Try + Return CType(Me(Me.tableTBCW_PROF_DOC_SEARCH.ADDED_WHOColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ADDED_WHO in Tabelle TBCW_PROF_DOC_SEARCH ist DBNull.", e) + End Try End Get Set Me(Me.tableTBCW_PROF_DOC_SEARCH.ADDED_WHOColumn) = value @@ -1956,11 +2559,7 @@ Partial Public Class DBCW_Stammdaten Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property COUNT_COMMAND() As String Get - Try - Return CType(Me(Me.tableTBCW_PROF_DOC_SEARCH.COUNT_COMMANDColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte COUNT_COMMAND in Tabelle TBCW_PROF_DOC_SEARCH ist DBNull.", e) - End Try + Return CType(Me(Me.tableTBCW_PROF_DOC_SEARCH.COUNT_COMMANDColumn),String) End Get Set Me(Me.tableTBCW_PROF_DOC_SEARCH.COUNT_COMMANDColumn) = value @@ -1978,6 +2577,18 @@ Partial Public Class DBCW_Stammdaten End Set End Property + _ + Public Function IsADDED_WHONull() As Boolean + Return Me.IsNull(Me.tableTBCW_PROF_DOC_SEARCH.ADDED_WHOColumn) + End Function + + _ + Public Sub SetADDED_WHONull() + Me(Me.tableTBCW_PROF_DOC_SEARCH.ADDED_WHOColumn) = Global.System.Convert.DBNull + End Sub + _ Public Function IsADDED_WHENNull() As Boolean @@ -2013,18 +2624,6 @@ Partial Public Class DBCW_Stammdaten Public Sub SetCHANGED_WHENNull() Me(Me.tableTBCW_PROF_DOC_SEARCH.CHANGED_WHENColumn) = Global.System.Convert.DBNull End Sub - - _ - Public Function IsCOUNT_COMMANDNull() As Boolean - Return Me.IsNull(Me.tableTBCW_PROF_DOC_SEARCH.COUNT_COMMANDColumn) - End Function - - _ - Public Sub SetCOUNT_COMMANDNull() - Me(Me.tableTBCW_PROF_DOC_SEARCH.COUNT_COMMANDColumn) = Global.System.Convert.DBNull - End Sub End Class ''' @@ -2123,7 +2722,11 @@ Partial Public Class DBCW_Stammdaten Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ADDED_WHO() As String Get - Return CType(Me(Me.tableTBCW_PROF_DATA_SEARCH.ADDED_WHOColumn),String) + Try + Return CType(Me(Me.tableTBCW_PROF_DATA_SEARCH.ADDED_WHOColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ADDED_WHO in Tabelle TBCW_PROF_DATA_SEARCH ist DBNull.", e) + End Try End Get Set Me(Me.tableTBCW_PROF_DATA_SEARCH.ADDED_WHOColumn) = value @@ -2197,6 +2800,18 @@ Partial Public Class DBCW_Stammdaten End Set End Property + _ + Public Function IsADDED_WHONull() As Boolean + Return Me.IsNull(Me.tableTBCW_PROF_DATA_SEARCH.ADDED_WHOColumn) + End Function + + _ + Public Sub SetADDED_WHONull() + Me(Me.tableTBCW_PROF_DATA_SEARCH.ADDED_WHOColumn) = Global.System.Convert.DBNull + End Sub + _ Public Function IsADDED_WHENNull() As Boolean @@ -2234,6 +2849,146 @@ Partial Public Class DBCW_Stammdaten End Sub End Class + ''' + '''Represents strongly named DataRow class. + ''' + Partial Public Class TBLOCAL_SEARCH_POSITIONRow + Inherits Global.System.Data.DataRow + + Private tableTBLOCAL_SEARCH_POSITION As TBLOCAL_SEARCH_POSITIONDataTable + + _ + Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) + MyBase.New(rb) + Me.tableTBLOCAL_SEARCH_POSITION = CType(Me.Table,TBLOCAL_SEARCH_POSITIONDataTable) + End Sub + + _ + Public Property ID() As String + Get + Try + Return CType(Me(Me.tableTBLOCAL_SEARCH_POSITION.IDColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ID in Tabelle TBLOCAL_SEARCH_POSITION ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBLOCAL_SEARCH_POSITION.IDColumn) = value + End Set + End Property + + _ + Public Property NAME() As String + Get + Try + Return CType(Me(Me.tableTBLOCAL_SEARCH_POSITION.NAMEColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte NAME in Tabelle TBLOCAL_SEARCH_POSITION ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBLOCAL_SEARCH_POSITION.NAMEColumn) = value + End Set + End Property + + _ + Public Function IsIDNull() As Boolean + Return Me.IsNull(Me.tableTBLOCAL_SEARCH_POSITION.IDColumn) + End Function + + _ + Public Sub SetIDNull() + Me(Me.tableTBLOCAL_SEARCH_POSITION.IDColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsNAMENull() As Boolean + Return Me.IsNull(Me.tableTBLOCAL_SEARCH_POSITION.NAMEColumn) + End Function + + _ + Public Sub SetNAMENull() + Me(Me.tableTBLOCAL_SEARCH_POSITION.NAMEColumn) = Global.System.Convert.DBNull + End Sub + End Class + + ''' + '''Represents strongly named DataRow class. + ''' + Partial Public Class TBLOCAL_PROFILE_TYPERow + Inherits Global.System.Data.DataRow + + Private tableTBLOCAL_PROFILE_TYPE As TBLOCAL_PROFILE_TYPEDataTable + + _ + Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) + MyBase.New(rb) + Me.tableTBLOCAL_PROFILE_TYPE = CType(Me.Table,TBLOCAL_PROFILE_TYPEDataTable) + End Sub + + _ + Public Property ID() As String + Get + Try + Return CType(Me(Me.tableTBLOCAL_PROFILE_TYPE.IDColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ID in Tabelle TBLOCAL_PROFILE_TYPE ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBLOCAL_PROFILE_TYPE.IDColumn) = value + End Set + End Property + + _ + Public Property NAME() As String + Get + Try + Return CType(Me(Me.tableTBLOCAL_PROFILE_TYPE.NAMEColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte NAME in Tabelle TBLOCAL_PROFILE_TYPE ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBLOCAL_PROFILE_TYPE.NAMEColumn) = value + End Set + End Property + + _ + Public Function IsIDNull() As Boolean + Return Me.IsNull(Me.tableTBLOCAL_PROFILE_TYPE.IDColumn) + End Function + + _ + Public Sub SetIDNull() + Me(Me.tableTBLOCAL_PROFILE_TYPE.IDColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsNAMENull() As Boolean + Return Me.IsNull(Me.tableTBLOCAL_PROFILE_TYPE.NAMEColumn) + End Function + + _ + Public Sub SetNAMENull() + Me(Me.tableTBLOCAL_PROFILE_TYPE.NAMEColumn) = Global.System.Convert.DBNull + End Sub + End Class + ''' '''Row event argument class ''' @@ -2341,6 +3096,78 @@ Partial Public Class DBCW_Stammdaten End Get End Property End Class + + ''' + '''Row event argument class + ''' + _ + Public Class TBLOCAL_SEARCH_POSITIONRowChangeEvent + Inherits Global.System.EventArgs + + Private eventRow As TBLOCAL_SEARCH_POSITIONRow + + Private eventAction As Global.System.Data.DataRowAction + + _ + Public Sub New(ByVal row As TBLOCAL_SEARCH_POSITIONRow, ByVal action As Global.System.Data.DataRowAction) + MyBase.New + Me.eventRow = row + Me.eventAction = action + End Sub + + _ + Public ReadOnly Property Row() As TBLOCAL_SEARCH_POSITIONRow + Get + Return Me.eventRow + End Get + End Property + + _ + Public ReadOnly Property Action() As Global.System.Data.DataRowAction + Get + Return Me.eventAction + End Get + End Property + End Class + + ''' + '''Row event argument class + ''' + _ + Public Class TBLOCAL_PROFILE_TYPERowChangeEvent + Inherits Global.System.EventArgs + + Private eventRow As TBLOCAL_PROFILE_TYPERow + + Private eventAction As Global.System.Data.DataRowAction + + _ + Public Sub New(ByVal row As TBLOCAL_PROFILE_TYPERow, ByVal action As Global.System.Data.DataRowAction) + MyBase.New + Me.eventRow = row + Me.eventAction = action + End Sub + + _ + Public ReadOnly Property Row() As TBLOCAL_PROFILE_TYPERow + Get + Return Me.eventRow + End Get + End Property + + _ + Public ReadOnly Property Action() As Global.System.Data.DataRowAction + Get + Return Me.eventAction + End Get + End Property + End Class End Class Namespace DBCW_StammdatenTableAdapters @@ -2655,8 +3482,7 @@ Namespace DBCW_StammdatenTableAdapters Me.Adapter.DeleteCommand.Parameters(1).Value = CType(Original_NAME,String) End If If (Original_COMMENT Is Nothing) Then - Me.Adapter.DeleteCommand.Parameters(2).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(3).Value = Global.System.DBNull.Value + Throw New Global.System.ArgumentNullException("Original_COMMENT") Else Me.Adapter.DeleteCommand.Parameters(2).Value = CType(0,Object) Me.Adapter.DeleteCommand.Parameters(3).Value = CType(Original_COMMENT,String) @@ -2667,7 +3493,7 @@ Namespace DBCW_StammdatenTableAdapters Me.Adapter.DeleteCommand.Parameters(4).Value = CType(Original_REGEX_EXPRESSION,String) End If If (Original_ADDED_WHO Is Nothing) Then - Throw New Global.System.ArgumentNullException("Original_ADDED_WHO") + Me.Adapter.DeleteCommand.Parameters(5).Value = Global.System.DBNull.Value Else Me.Adapter.DeleteCommand.Parameters(5).Value = CType(Original_ADDED_WHO,String) End If @@ -2720,7 +3546,7 @@ Namespace DBCW_StammdatenTableAdapters Me.Adapter.InsertCommand.Parameters(0).Value = CType(NAME,String) End If If (COMMENT Is Nothing) Then - Me.Adapter.InsertCommand.Parameters(1).Value = Global.System.DBNull.Value + Throw New Global.System.ArgumentNullException("COMMENT") Else Me.Adapter.InsertCommand.Parameters(1).Value = CType(COMMENT,String) End If @@ -2730,7 +3556,7 @@ Namespace DBCW_StammdatenTableAdapters Me.Adapter.InsertCommand.Parameters(2).Value = CType(REGEX_EXPRESSION,String) End If If (ADDED_WHO Is Nothing) Then - Throw New Global.System.ArgumentNullException("ADDED_WHO") + Me.Adapter.InsertCommand.Parameters(3).Value = Global.System.DBNull.Value Else Me.Adapter.InsertCommand.Parameters(3).Value = CType(ADDED_WHO,String) End If @@ -2797,7 +3623,7 @@ Namespace DBCW_StammdatenTableAdapters Me.Adapter.UpdateCommand.Parameters(0).Value = CType(NAME,String) End If If (COMMENT Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(1).Value = Global.System.DBNull.Value + Throw New Global.System.ArgumentNullException("COMMENT") Else Me.Adapter.UpdateCommand.Parameters(1).Value = CType(COMMENT,String) End If @@ -2807,7 +3633,7 @@ Namespace DBCW_StammdatenTableAdapters Me.Adapter.UpdateCommand.Parameters(2).Value = CType(REGEX_EXPRESSION,String) End If If (ADDED_WHO Is Nothing) Then - Throw New Global.System.ArgumentNullException("ADDED_WHO") + Me.Adapter.UpdateCommand.Parameters(3).Value = Global.System.DBNull.Value Else Me.Adapter.UpdateCommand.Parameters(3).Value = CType(ADDED_WHO,String) End If @@ -2835,8 +3661,7 @@ Namespace DBCW_StammdatenTableAdapters Me.Adapter.UpdateCommand.Parameters(10).Value = CType(Original_NAME,String) End If If (Original_COMMENT Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(11).Value = CType(1,Object) - Me.Adapter.UpdateCommand.Parameters(12).Value = Global.System.DBNull.Value + Throw New Global.System.ArgumentNullException("Original_COMMENT") Else Me.Adapter.UpdateCommand.Parameters(11).Value = CType(0,Object) Me.Adapter.UpdateCommand.Parameters(12).Value = CType(Original_COMMENT,String) @@ -2847,7 +3672,7 @@ Namespace DBCW_StammdatenTableAdapters Me.Adapter.UpdateCommand.Parameters(13).Value = CType(Original_REGEX_EXPRESSION,String) End If If (Original_ADDED_WHO Is Nothing) Then - Throw New Global.System.ArgumentNullException("Original_ADDED_WHO") + Me.Adapter.UpdateCommand.Parameters(14).Value = Global.System.DBNull.Value Else Me.Adapter.UpdateCommand.Parameters(14).Value = CType(Original_ADDED_WHO,String) End If @@ -3236,7 +4061,7 @@ Namespace DBCW_StammdatenTableAdapters Me.Adapter.DeleteCommand.Parameters(5).Value = CType(Original_TAB_TITLE,String) End If If (Original_ADDED_WHO Is Nothing) Then - Throw New Global.System.ArgumentNullException("Original_ADDED_WHO") + Me.Adapter.DeleteCommand.Parameters(6).Value = Global.System.DBNull.Value Else Me.Adapter.DeleteCommand.Parameters(6).Value = CType(Original_ADDED_WHO,String) End If @@ -3296,7 +4121,7 @@ Namespace DBCW_StammdatenTableAdapters Me.Adapter.InsertCommand.Parameters(5).Value = CType(TAB_TITLE,String) End If If (ADDED_WHO Is Nothing) Then - Throw New Global.System.ArgumentNullException("ADDED_WHO") + Me.Adapter.InsertCommand.Parameters(6).Value = Global.System.DBNull.Value Else Me.Adapter.InsertCommand.Parameters(6).Value = CType(ADDED_WHO,String) End If @@ -3316,7 +4141,7 @@ Namespace DBCW_StammdatenTableAdapters Me.Adapter.InsertCommand.Parameters(9).Value = Global.System.DBNull.Value End If If (COUNT_COMMAND Is Nothing) Then - Me.Adapter.InsertCommand.Parameters(10).Value = Global.System.DBNull.Value + Throw New Global.System.ArgumentNullException("COUNT_COMMAND") Else Me.Adapter.InsertCommand.Parameters(10).Value = CType(COUNT_COMMAND,String) End If @@ -3377,7 +4202,7 @@ Namespace DBCW_StammdatenTableAdapters Me.Adapter.UpdateCommand.Parameters(5).Value = CType(TAB_TITLE,String) End If If (ADDED_WHO Is Nothing) Then - Throw New Global.System.ArgumentNullException("ADDED_WHO") + Me.Adapter.UpdateCommand.Parameters(6).Value = Global.System.DBNull.Value Else Me.Adapter.UpdateCommand.Parameters(6).Value = CType(ADDED_WHO,String) End If @@ -3397,7 +4222,7 @@ Namespace DBCW_StammdatenTableAdapters Me.Adapter.UpdateCommand.Parameters(9).Value = Global.System.DBNull.Value End If If (COUNT_COMMAND Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(10).Value = Global.System.DBNull.Value + Throw New Global.System.ArgumentNullException("COUNT_COMMAND") Else Me.Adapter.UpdateCommand.Parameters(10).Value = CType(COUNT_COMMAND,String) End If @@ -3412,7 +4237,7 @@ Namespace DBCW_StammdatenTableAdapters Me.Adapter.UpdateCommand.Parameters(16).Value = CType(Original_TAB_TITLE,String) End If If (Original_ADDED_WHO Is Nothing) Then - Throw New Global.System.ArgumentNullException("Original_ADDED_WHO") + Me.Adapter.UpdateCommand.Parameters(17).Value = Global.System.DBNull.Value Else Me.Adapter.UpdateCommand.Parameters(17).Value = CType(Original_ADDED_WHO,String) End If @@ -3802,7 +4627,7 @@ Namespace DBCW_StammdatenTableAdapters Me.Adapter.DeleteCommand.Parameters(5).Value = CType(Original_TAB_TITLE,String) End If If (Original_ADDED_WHO Is Nothing) Then - Throw New Global.System.ArgumentNullException("Original_ADDED_WHO") + Me.Adapter.DeleteCommand.Parameters(6).Value = Global.System.DBNull.Value Else Me.Adapter.DeleteCommand.Parameters(6).Value = CType(Original_ADDED_WHO,String) End If @@ -3862,7 +4687,7 @@ Namespace DBCW_StammdatenTableAdapters Me.Adapter.InsertCommand.Parameters(5).Value = CType(TAB_TITLE,String) End If If (ADDED_WHO Is Nothing) Then - Throw New Global.System.ArgumentNullException("ADDED_WHO") + Me.Adapter.InsertCommand.Parameters(6).Value = Global.System.DBNull.Value Else Me.Adapter.InsertCommand.Parameters(6).Value = CType(ADDED_WHO,String) End If @@ -3943,7 +4768,7 @@ Namespace DBCW_StammdatenTableAdapters Me.Adapter.UpdateCommand.Parameters(5).Value = CType(TAB_TITLE,String) End If If (ADDED_WHO Is Nothing) Then - Throw New Global.System.ArgumentNullException("ADDED_WHO") + Me.Adapter.UpdateCommand.Parameters(6).Value = Global.System.DBNull.Value Else Me.Adapter.UpdateCommand.Parameters(6).Value = CType(ADDED_WHO,String) End If @@ -3978,7 +4803,7 @@ Namespace DBCW_StammdatenTableAdapters Me.Adapter.UpdateCommand.Parameters(16).Value = CType(Original_TAB_TITLE,String) End If If (Original_ADDED_WHO Is Nothing) Then - Throw New Global.System.ArgumentNullException("Original_ADDED_WHO") + Me.Adapter.UpdateCommand.Parameters(17).Value = Global.System.DBNull.Value Else Me.Adapter.UpdateCommand.Parameters(17).Value = CType(Original_ADDED_WHO,String) End If diff --git a/GUIs.ZooFlow/DBCW_Stammdaten.xsd b/GUIs.ZooFlow/DBCW_Stammdaten.xsd index 082e8626..c535b429 100644 --- a/GUIs.ZooFlow/DBCW_Stammdaten.xsd +++ b/GUIs.ZooFlow/DBCW_Stammdaten.xsd @@ -16,10 +16,10 @@ - - + + - + @@ -37,9 +37,9 @@ SELECT GUID, NAME, COMMENT, REGEX_EXPRESSION, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, ACTIVE, PROFILE_TYPE FROM TBCW_PROFILES WHERE (GUID = SCOPE_IDENTITY()) - + - + @@ -62,9 +62,9 @@ SELECT GUID, NAME, COMMENT, REGEX_EXPRESSION, ADDED_WHO, ADDED_WHEN, CHANGED_WHO SELECT GUID, NAME, COMMENT, REGEX_EXPRESSION, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, ACTIVE, PROFILE_TYPE FROM TBCW_PROFILES WHERE (GUID = @GUID) - + - + @@ -72,10 +72,10 @@ SELECT GUID, NAME, COMMENT, REGEX_EXPRESSION, ADDED_WHO, ADDED_WHEN, CHANGED_WHO - - + + - + @@ -117,7 +117,7 @@ SELECT GUID, NAME, COMMENT, REGEX_EXPRESSION, ADDED_WHO, ADDED_WHEN, CHANGED_WHO - + @@ -138,11 +138,11 @@ SELECT GUID, PROFILE_ID, CONN_ID, SQL_COMMAND, TAB_INDEX, ACTIVE, TAB_TITLE, ADD - + - + @@ -166,18 +166,18 @@ SELECT GUID, PROFILE_ID, CONN_ID, SQL_COMMAND, TAB_INDEX, ACTIVE, TAB_TITLE, ADD - + - + - + @@ -219,7 +219,7 @@ SELECT GUID, PROFILE_ID, CONN_ID, SQL_COMMAND, TAB_INDEX, ACTIVE, TAB_TITLE, ADD - + @@ -240,7 +240,7 @@ SELECT GUID, PROFILE_ID, CONN_ID, SQL_COMMAND, TAB_INDEX, ACTIVE, TAB_TITLE, ADD - + @@ -269,7 +269,7 @@ SELECT GUID, PROFILE_ID, CONN_ID, SQL_COMMAND, TAB_INDEX, ACTIVE, TAB_TITLE, ADD - + @@ -280,7 +280,7 @@ SELECT GUID, PROFILE_ID, CONN_ID, SQL_COMMAND, TAB_INDEX, ACTIVE, TAB_TITLE, ADD - + @@ -317,7 +317,7 @@ SELECT GUID, PROFILE_ID, CONN_ID, SQL_COMMAND, TAB_INDEX, ACTIVE, TAB_TITLE, ADD - + @@ -328,7 +328,7 @@ SELECT GUID, PROFILE_ID, CONN_ID, SQL_COMMAND, TAB_INDEX, ACTIVE, TAB_TITLE, ADD - + @@ -342,7 +342,7 @@ SELECT GUID, PROFILE_ID, CONN_ID, SQL_COMMAND, TAB_INDEX, ACTIVE, TAB_TITLE, ADD - + @@ -363,7 +363,7 @@ SELECT GUID, PROFILE_ID, CONN_ID, SQL_COMMAND, TAB_INDEX, ACTIVE, TAB_TITLE, ADD - + @@ -385,7 +385,7 @@ SELECT GUID, PROFILE_ID, CONN_ID, SQL_COMMAND, TAB_INDEX, ACTIVE, TAB_TITLE, ADD - + @@ -401,7 +401,7 @@ SELECT GUID, PROFILE_ID, CONN_ID, SQL_COMMAND, TAB_INDEX, ACTIVE, TAB_TITLE, ADD - + @@ -411,7 +411,7 @@ SELECT GUID, PROFILE_ID, CONN_ID, SQL_COMMAND, TAB_INDEX, ACTIVE, TAB_TITLE, ADD - + @@ -433,7 +433,7 @@ SELECT GUID, PROFILE_ID, CONN_ID, SQL_COMMAND, TAB_INDEX, ACTIVE, TAB_TITLE, ADD - + @@ -459,6 +459,22 @@ SELECT GUID, PROFILE_ID, CONN_ID, SQL_COMMAND, TAB_INDEX, ACTIVE, TAB_TITLE, ADD + + + + + + + + + + + + + + + + @@ -476,8 +492,8 @@ SELECT GUID, PROFILE_ID, CONN_ID, SQL_COMMAND, TAB_INDEX, ACTIVE, TAB_TITLE, ADD - - + + \ No newline at end of file diff --git a/GUIs.ZooFlow/DBCW_Stammdaten.xss b/GUIs.ZooFlow/DBCW_Stammdaten.xss index bc0a1bec..bf55cef0 100644 --- a/GUIs.ZooFlow/DBCW_Stammdaten.xss +++ b/GUIs.ZooFlow/DBCW_Stammdaten.xss @@ -6,32 +6,34 @@ --> - - - + + + + + - + 285 - 79 + 78 - 664 - 79 + 429 + 78 - + 285 - 262 + 107 - 673 - 262 + 828 + 107 diff --git a/GUIs.ZooFlow/DSDD_Stammdaten.Designer.vb b/GUIs.ZooFlow/DSDD_Stammdaten.Designer.vb new file mode 100644 index 00000000..b6cab462 --- /dev/null +++ b/GUIs.ZooFlow/DSDD_Stammdaten.Designer.vb @@ -0,0 +1,1835 @@ +'------------------------------------------------------------------------------ +' +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 +' +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. +' +'------------------------------------------------------------------------------ + +Option Strict Off +Option Explicit On + + + +''' +'''Represents a strongly typed in-memory cache of data. +''' + _ +Partial Public Class DSDD_Stammdaten + Inherits Global.System.Data.DataSet + + Private tableTBDD_CONNECTION As TBDD_CONNECTIONDataTable + + Private _schemaSerializationMode As Global.System.Data.SchemaSerializationMode = Global.System.Data.SchemaSerializationMode.IncludeSchema + + _ + Public Sub New() + MyBase.New + Me.BeginInit + Me.InitClass + Dim schemaChangedHandler As Global.System.ComponentModel.CollectionChangeEventHandler = AddressOf Me.SchemaChanged + AddHandler MyBase.Tables.CollectionChanged, schemaChangedHandler + AddHandler MyBase.Relations.CollectionChanged, schemaChangedHandler + Me.EndInit + End Sub + + _ + Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) + MyBase.New(info, context, false) + If (Me.IsBinarySerialized(info, context) = true) Then + Me.InitVars(false) + Dim schemaChangedHandler1 As Global.System.ComponentModel.CollectionChangeEventHandler = AddressOf Me.SchemaChanged + AddHandler Me.Tables.CollectionChanged, schemaChangedHandler1 + AddHandler Me.Relations.CollectionChanged, schemaChangedHandler1 + Return + End If + Dim strSchema As String = CType(info.GetValue("XmlSchema", GetType(String)),String) + If (Me.DetermineSchemaSerializationMode(info, context) = Global.System.Data.SchemaSerializationMode.IncludeSchema) Then + Dim ds As Global.System.Data.DataSet = New Global.System.Data.DataSet() + ds.ReadXmlSchema(New Global.System.Xml.XmlTextReader(New Global.System.IO.StringReader(strSchema))) + If (Not (ds.Tables("TBDD_CONNECTION")) Is Nothing) Then + MyBase.Tables.Add(New TBDD_CONNECTIONDataTable(ds.Tables("TBDD_CONNECTION"))) + End If + Me.DataSetName = ds.DataSetName + Me.Prefix = ds.Prefix + Me.Namespace = ds.Namespace + Me.Locale = ds.Locale + Me.CaseSensitive = ds.CaseSensitive + Me.EnforceConstraints = ds.EnforceConstraints + Me.Merge(ds, false, Global.System.Data.MissingSchemaAction.Add) + Me.InitVars + Else + Me.ReadXmlSchema(New Global.System.Xml.XmlTextReader(New Global.System.IO.StringReader(strSchema))) + End If + Me.GetSerializationData(info, context) + Dim schemaChangedHandler As Global.System.ComponentModel.CollectionChangeEventHandler = AddressOf Me.SchemaChanged + AddHandler MyBase.Tables.CollectionChanged, schemaChangedHandler + AddHandler Me.Relations.CollectionChanged, schemaChangedHandler + End Sub + + _ + Public ReadOnly Property TBDD_CONNECTION() As TBDD_CONNECTIONDataTable + Get + Return Me.tableTBDD_CONNECTION + End Get + End Property + + _ + Public Overrides Property SchemaSerializationMode() As Global.System.Data.SchemaSerializationMode + Get + Return Me._schemaSerializationMode + End Get + Set + Me._schemaSerializationMode = value + End Set + End Property + + _ + Public Shadows ReadOnly Property Tables() As Global.System.Data.DataTableCollection + Get + Return MyBase.Tables + End Get + End Property + + _ + Public Shadows ReadOnly Property Relations() As Global.System.Data.DataRelationCollection + Get + Return MyBase.Relations + End Get + End Property + + _ + Protected Overrides Sub InitializeDerivedDataSet() + Me.BeginInit + Me.InitClass + Me.EndInit + End Sub + + _ + Public Overrides Function Clone() As Global.System.Data.DataSet + Dim cln As DSDD_Stammdaten = CType(MyBase.Clone,DSDD_Stammdaten) + cln.InitVars + cln.SchemaSerializationMode = Me.SchemaSerializationMode + Return cln + End Function + + _ + Protected Overrides Function ShouldSerializeTables() As Boolean + Return false + End Function + + _ + Protected Overrides Function ShouldSerializeRelations() As Boolean + Return false + End Function + + _ + Protected Overrides Sub ReadXmlSerializable(ByVal reader As Global.System.Xml.XmlReader) + If (Me.DetermineSchemaSerializationMode(reader) = Global.System.Data.SchemaSerializationMode.IncludeSchema) Then + Me.Reset + Dim ds As Global.System.Data.DataSet = New Global.System.Data.DataSet() + ds.ReadXml(reader) + If (Not (ds.Tables("TBDD_CONNECTION")) Is Nothing) Then + MyBase.Tables.Add(New TBDD_CONNECTIONDataTable(ds.Tables("TBDD_CONNECTION"))) + End If + Me.DataSetName = ds.DataSetName + Me.Prefix = ds.Prefix + Me.Namespace = ds.Namespace + Me.Locale = ds.Locale + Me.CaseSensitive = ds.CaseSensitive + Me.EnforceConstraints = ds.EnforceConstraints + Me.Merge(ds, false, Global.System.Data.MissingSchemaAction.Add) + Me.InitVars + Else + Me.ReadXml(reader) + Me.InitVars + End If + End Sub + + _ + Protected Overrides Function GetSchemaSerializable() As Global.System.Xml.Schema.XmlSchema + Dim stream As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream() + Me.WriteXmlSchema(New Global.System.Xml.XmlTextWriter(stream, Nothing)) + stream.Position = 0 + Return Global.System.Xml.Schema.XmlSchema.Read(New Global.System.Xml.XmlTextReader(stream), Nothing) + End Function + + _ + Friend Overloads Sub InitVars() + Me.InitVars(true) + End Sub + + _ + Friend Overloads Sub InitVars(ByVal initTable As Boolean) + Me.tableTBDD_CONNECTION = CType(MyBase.Tables("TBDD_CONNECTION"),TBDD_CONNECTIONDataTable) + If (initTable = true) Then + If (Not (Me.tableTBDD_CONNECTION) Is Nothing) Then + Me.tableTBDD_CONNECTION.InitVars + End If + End If + End Sub + + _ + Private Sub InitClass() + Me.DataSetName = "DSDD_Stammdaten" + Me.Prefix = "" + Me.Namespace = "http://tempuri.org/DSDD_Stammdaten.xsd" + Me.EnforceConstraints = true + Me.SchemaSerializationMode = Global.System.Data.SchemaSerializationMode.IncludeSchema + Me.tableTBDD_CONNECTION = New TBDD_CONNECTIONDataTable() + MyBase.Tables.Add(Me.tableTBDD_CONNECTION) + End Sub + + _ + Private Function ShouldSerializeTBDD_CONNECTION() As Boolean + Return false + End Function + + _ + Private Sub SchemaChanged(ByVal sender As Object, ByVal e As Global.System.ComponentModel.CollectionChangeEventArgs) + If (e.Action = Global.System.ComponentModel.CollectionChangeAction.Remove) Then + Me.InitVars + End If + End Sub + + _ + Public Shared Function GetTypedDataSetSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType + Dim ds As DSDD_Stammdaten = New DSDD_Stammdaten() + Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() + Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence() + Dim any As Global.System.Xml.Schema.XmlSchemaAny = New Global.System.Xml.Schema.XmlSchemaAny() + any.Namespace = ds.Namespace + sequence.Items.Add(any) + type.Particle = sequence + Dim dsSchema As Global.System.Xml.Schema.XmlSchema = ds.GetSchemaSerializable + If xs.Contains(dsSchema.TargetNamespace) Then + Dim s1 As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream() + Dim s2 As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream() + Try + Dim schema As Global.System.Xml.Schema.XmlSchema = Nothing + dsSchema.Write(s1) + Dim schemas As Global.System.Collections.IEnumerator = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator + Do While schemas.MoveNext + schema = CType(schemas.Current,Global.System.Xml.Schema.XmlSchema) + s2.SetLength(0) + schema.Write(s2) + If (s1.Length = s2.Length) Then + s1.Position = 0 + s2.Position = 0 + + Do While ((s1.Position <> s1.Length) _ + AndAlso (s1.ReadByte = s2.ReadByte)) + + + Loop + If (s1.Position = s1.Length) Then + Return type + End If + End If + + Loop + Finally + If (Not (s1) Is Nothing) Then + s1.Close + End If + If (Not (s2) Is Nothing) Then + s2.Close + End If + End Try + End If + xs.Add(dsSchema) + Return type + End Function + + _ + Public Delegate Sub TBDD_CONNECTIONRowChangeEventHandler(ByVal sender As Object, ByVal e As TBDD_CONNECTIONRowChangeEvent) + + ''' + '''Represents the strongly named DataTable class. + ''' + _ + Partial Public Class TBDD_CONNECTIONDataTable + Inherits Global.System.Data.TypedTableBase(Of TBDD_CONNECTIONRow) + + Private columnGUID As Global.System.Data.DataColumn + + Private columnBEZEICHNUNG As Global.System.Data.DataColumn + + Private columnSQL_PROVIDER As Global.System.Data.DataColumn + + Private columnSERVER As Global.System.Data.DataColumn + + Private columnDATENBANK As Global.System.Data.DataColumn + + Private columnUSERNAME As Global.System.Data.DataColumn + + Private columnPASSWORD As Global.System.Data.DataColumn + + Private columnBEMERKUNG As Global.System.Data.DataColumn + + Private columnAKTIV As Global.System.Data.DataColumn + + Private columnERSTELLTWER As Global.System.Data.DataColumn + + Private columnERSTELLTWANN As Global.System.Data.DataColumn + + Private columnGEANDERTWER As Global.System.Data.DataColumn + + Private columnGEAENDERTWANN As Global.System.Data.DataColumn + + Private columnSYS_CONNECTION As Global.System.Data.DataColumn + + _ + Public Sub New() + MyBase.New + Me.TableName = "TBDD_CONNECTION" + Me.BeginInit + Me.InitClass + Me.EndInit + End Sub + + _ + Friend Sub New(ByVal table As Global.System.Data.DataTable) + MyBase.New + Me.TableName = table.TableName + If (table.CaseSensitive <> table.DataSet.CaseSensitive) Then + Me.CaseSensitive = table.CaseSensitive + End If + If (table.Locale.ToString <> table.DataSet.Locale.ToString) Then + Me.Locale = table.Locale + End If + If (table.Namespace <> table.DataSet.Namespace) Then + Me.Namespace = table.Namespace + End If + Me.Prefix = table.Prefix + Me.MinimumCapacity = table.MinimumCapacity + End Sub + + _ + Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) + MyBase.New(info, context) + Me.InitVars + End Sub + + _ + Public ReadOnly Property GUIDColumn() As Global.System.Data.DataColumn + Get + Return Me.columnGUID + End Get + End Property + + _ + Public ReadOnly Property BEZEICHNUNGColumn() As Global.System.Data.DataColumn + Get + Return Me.columnBEZEICHNUNG + End Get + End Property + + _ + Public ReadOnly Property SQL_PROVIDERColumn() As Global.System.Data.DataColumn + Get + Return Me.columnSQL_PROVIDER + End Get + End Property + + _ + Public ReadOnly Property SERVERColumn() As Global.System.Data.DataColumn + Get + Return Me.columnSERVER + End Get + End Property + + _ + Public ReadOnly Property DATENBANKColumn() As Global.System.Data.DataColumn + Get + Return Me.columnDATENBANK + End Get + End Property + + _ + Public ReadOnly Property USERNAMEColumn() As Global.System.Data.DataColumn + Get + Return Me.columnUSERNAME + End Get + End Property + + _ + Public ReadOnly Property PASSWORDColumn() As Global.System.Data.DataColumn + Get + Return Me.columnPASSWORD + End Get + End Property + + _ + Public ReadOnly Property BEMERKUNGColumn() As Global.System.Data.DataColumn + Get + Return Me.columnBEMERKUNG + End Get + End Property + + _ + Public ReadOnly Property AKTIVColumn() As Global.System.Data.DataColumn + Get + Return Me.columnAKTIV + End Get + End Property + + _ + Public ReadOnly Property ERSTELLTWERColumn() As Global.System.Data.DataColumn + Get + Return Me.columnERSTELLTWER + End Get + End Property + + _ + Public ReadOnly Property ERSTELLTWANNColumn() As Global.System.Data.DataColumn + Get + Return Me.columnERSTELLTWANN + End Get + End Property + + _ + Public ReadOnly Property GEANDERTWERColumn() As Global.System.Data.DataColumn + Get + Return Me.columnGEANDERTWER + End Get + End Property + + _ + Public ReadOnly Property GEAENDERTWANNColumn() As Global.System.Data.DataColumn + Get + Return Me.columnGEAENDERTWANN + End Get + End Property + + _ + Public ReadOnly Property SYS_CONNECTIONColumn() As Global.System.Data.DataColumn + Get + Return Me.columnSYS_CONNECTION + End Get + End Property + + _ + Public ReadOnly Property Count() As Integer + Get + Return Me.Rows.Count + End Get + End Property + + _ + Public Default ReadOnly Property Item(ByVal index As Integer) As TBDD_CONNECTIONRow + Get + Return CType(Me.Rows(index),TBDD_CONNECTIONRow) + End Get + End Property + + _ + Public Event TBDD_CONNECTIONRowChanging As TBDD_CONNECTIONRowChangeEventHandler + + _ + Public Event TBDD_CONNECTIONRowChanged As TBDD_CONNECTIONRowChangeEventHandler + + _ + Public Event TBDD_CONNECTIONRowDeleting As TBDD_CONNECTIONRowChangeEventHandler + + _ + Public Event TBDD_CONNECTIONRowDeleted As TBDD_CONNECTIONRowChangeEventHandler + + _ + Public Overloads Sub AddTBDD_CONNECTIONRow(ByVal row As TBDD_CONNECTIONRow) + Me.Rows.Add(row) + End Sub + + _ + Public Overloads Function AddTBDD_CONNECTIONRow(ByVal BEZEICHNUNG As String, ByVal SQL_PROVIDER As String, ByVal SERVER As String, ByVal DATENBANK As String, ByVal USERNAME As String, ByVal PASSWORD As String, ByVal BEMERKUNG As String, ByVal AKTIV As Boolean, ByVal ERSTELLTWER As String, ByVal ERSTELLTWANN As Date, ByVal GEANDERTWER As String, ByVal GEAENDERTWANN As Date, ByVal SYS_CONNECTION As Boolean) As TBDD_CONNECTIONRow + Dim rowTBDD_CONNECTIONRow As TBDD_CONNECTIONRow = CType(Me.NewRow,TBDD_CONNECTIONRow) + Dim columnValuesArray() As Object = New Object() {Nothing, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, BEMERKUNG, AKTIV, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN, SYS_CONNECTION} + rowTBDD_CONNECTIONRow.ItemArray = columnValuesArray + Me.Rows.Add(rowTBDD_CONNECTIONRow) + Return rowTBDD_CONNECTIONRow + End Function + + _ + Public Function FindByGUID(ByVal GUID As Short) As TBDD_CONNECTIONRow + Return CType(Me.Rows.Find(New Object() {GUID}),TBDD_CONNECTIONRow) + End Function + + _ + Public Overrides Function Clone() As Global.System.Data.DataTable + Dim cln As TBDD_CONNECTIONDataTable = CType(MyBase.Clone,TBDD_CONNECTIONDataTable) + cln.InitVars + Return cln + End Function + + _ + Protected Overrides Function CreateInstance() As Global.System.Data.DataTable + Return New TBDD_CONNECTIONDataTable() + End Function + + _ + Friend Sub InitVars() + Me.columnGUID = MyBase.Columns("GUID") + Me.columnBEZEICHNUNG = MyBase.Columns("BEZEICHNUNG") + Me.columnSQL_PROVIDER = MyBase.Columns("SQL_PROVIDER") + Me.columnSERVER = MyBase.Columns("SERVER") + Me.columnDATENBANK = MyBase.Columns("DATENBANK") + Me.columnUSERNAME = MyBase.Columns("USERNAME") + Me.columnPASSWORD = MyBase.Columns("PASSWORD") + Me.columnBEMERKUNG = MyBase.Columns("BEMERKUNG") + Me.columnAKTIV = MyBase.Columns("AKTIV") + Me.columnERSTELLTWER = MyBase.Columns("ERSTELLTWER") + Me.columnERSTELLTWANN = MyBase.Columns("ERSTELLTWANN") + Me.columnGEANDERTWER = MyBase.Columns("GEANDERTWER") + Me.columnGEAENDERTWANN = MyBase.Columns("GEAENDERTWANN") + Me.columnSYS_CONNECTION = MyBase.Columns("SYS_CONNECTION") + End Sub + + _ + Private Sub InitClass() + Me.columnGUID = New Global.System.Data.DataColumn("GUID", GetType(Short), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnGUID) + Me.columnBEZEICHNUNG = New Global.System.Data.DataColumn("BEZEICHNUNG", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnBEZEICHNUNG) + Me.columnSQL_PROVIDER = New Global.System.Data.DataColumn("SQL_PROVIDER", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnSQL_PROVIDER) + Me.columnSERVER = New Global.System.Data.DataColumn("SERVER", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnSERVER) + Me.columnDATENBANK = New Global.System.Data.DataColumn("DATENBANK", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnDATENBANK) + Me.columnUSERNAME = New Global.System.Data.DataColumn("USERNAME", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnUSERNAME) + Me.columnPASSWORD = New Global.System.Data.DataColumn("PASSWORD", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnPASSWORD) + Me.columnBEMERKUNG = New Global.System.Data.DataColumn("BEMERKUNG", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnBEMERKUNG) + Me.columnAKTIV = New Global.System.Data.DataColumn("AKTIV", GetType(Boolean), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnAKTIV) + Me.columnERSTELLTWER = New Global.System.Data.DataColumn("ERSTELLTWER", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnERSTELLTWER) + Me.columnERSTELLTWANN = New Global.System.Data.DataColumn("ERSTELLTWANN", GetType(Date), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnERSTELLTWANN) + Me.columnGEANDERTWER = New Global.System.Data.DataColumn("GEANDERTWER", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnGEANDERTWER) + Me.columnGEAENDERTWANN = New Global.System.Data.DataColumn("GEAENDERTWANN", GetType(Date), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnGEAENDERTWANN) + Me.columnSYS_CONNECTION = New Global.System.Data.DataColumn("SYS_CONNECTION", GetType(Boolean), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnSYS_CONNECTION) + Me.Constraints.Add(New Global.System.Data.UniqueConstraint("Constraint1", New Global.System.Data.DataColumn() {Me.columnGUID}, true)) + Me.columnGUID.AutoIncrement = true + Me.columnGUID.AutoIncrementSeed = -1 + Me.columnGUID.AutoIncrementStep = -1 + Me.columnGUID.AllowDBNull = false + Me.columnGUID.ReadOnly = true + Me.columnGUID.Unique = true + Me.columnBEZEICHNUNG.MaxLength = 100 + Me.columnSQL_PROVIDER.MaxLength = 50 + Me.columnSERVER.MaxLength = 150 + Me.columnDATENBANK.MaxLength = 100 + Me.columnUSERNAME.MaxLength = 100 + Me.columnPASSWORD.MaxLength = 100 + Me.columnBEMERKUNG.MaxLength = 400 + Me.columnAKTIV.AllowDBNull = false + Me.columnERSTELLTWER.AllowDBNull = false + Me.columnERSTELLTWER.MaxLength = 50 + Me.columnGEANDERTWER.MaxLength = 50 + Me.columnSYS_CONNECTION.AllowDBNull = false + End Sub + + _ + Public Function NewTBDD_CONNECTIONRow() As TBDD_CONNECTIONRow + Return CType(Me.NewRow,TBDD_CONNECTIONRow) + End Function + + _ + Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow + Return New TBDD_CONNECTIONRow(builder) + End Function + + _ + Protected Overrides Function GetRowType() As Global.System.Type + Return GetType(TBDD_CONNECTIONRow) + End Function + + _ + Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowChanged(e) + If (Not (Me.TBDD_CONNECTIONRowChangedEvent) Is Nothing) Then + RaiseEvent TBDD_CONNECTIONRowChanged(Me, New TBDD_CONNECTIONRowChangeEvent(CType(e.Row,TBDD_CONNECTIONRow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowChanging(e) + If (Not (Me.TBDD_CONNECTIONRowChangingEvent) Is Nothing) Then + RaiseEvent TBDD_CONNECTIONRowChanging(Me, New TBDD_CONNECTIONRowChangeEvent(CType(e.Row,TBDD_CONNECTIONRow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowDeleted(e) + If (Not (Me.TBDD_CONNECTIONRowDeletedEvent) Is Nothing) Then + RaiseEvent TBDD_CONNECTIONRowDeleted(Me, New TBDD_CONNECTIONRowChangeEvent(CType(e.Row,TBDD_CONNECTIONRow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowDeleting(e) + If (Not (Me.TBDD_CONNECTIONRowDeletingEvent) Is Nothing) Then + RaiseEvent TBDD_CONNECTIONRowDeleting(Me, New TBDD_CONNECTIONRowChangeEvent(CType(e.Row,TBDD_CONNECTIONRow), e.Action)) + End If + End Sub + + _ + Public Sub RemoveTBDD_CONNECTIONRow(ByVal row As TBDD_CONNECTIONRow) + Me.Rows.Remove(row) + End Sub + + _ + Public Shared Function GetTypedTableSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType + Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() + Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence() + Dim ds As DSDD_Stammdaten = New DSDD_Stammdaten() + Dim any1 As Global.System.Xml.Schema.XmlSchemaAny = New Global.System.Xml.Schema.XmlSchemaAny() + any1.Namespace = "http://www.w3.org/2001/XMLSchema" + any1.MinOccurs = New Decimal(0) + any1.MaxOccurs = Decimal.MaxValue + any1.ProcessContents = Global.System.Xml.Schema.XmlSchemaContentProcessing.Lax + sequence.Items.Add(any1) + Dim any2 As Global.System.Xml.Schema.XmlSchemaAny = New Global.System.Xml.Schema.XmlSchemaAny() + any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1" + any2.MinOccurs = New Decimal(1) + any2.ProcessContents = Global.System.Xml.Schema.XmlSchemaContentProcessing.Lax + sequence.Items.Add(any2) + Dim attribute1 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() + attribute1.Name = "namespace" + attribute1.FixedValue = ds.Namespace + type.Attributes.Add(attribute1) + Dim attribute2 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() + attribute2.Name = "tableTypeName" + attribute2.FixedValue = "TBDD_CONNECTIONDataTable" + type.Attributes.Add(attribute2) + type.Particle = sequence + Dim dsSchema As Global.System.Xml.Schema.XmlSchema = ds.GetSchemaSerializable + If xs.Contains(dsSchema.TargetNamespace) Then + Dim s1 As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream() + Dim s2 As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream() + Try + Dim schema As Global.System.Xml.Schema.XmlSchema = Nothing + dsSchema.Write(s1) + Dim schemas As Global.System.Collections.IEnumerator = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator + Do While schemas.MoveNext + schema = CType(schemas.Current,Global.System.Xml.Schema.XmlSchema) + s2.SetLength(0) + schema.Write(s2) + If (s1.Length = s2.Length) Then + s1.Position = 0 + s2.Position = 0 + + Do While ((s1.Position <> s1.Length) _ + AndAlso (s1.ReadByte = s2.ReadByte)) + + + Loop + If (s1.Position = s1.Length) Then + Return type + End If + End If + + Loop + Finally + If (Not (s1) Is Nothing) Then + s1.Close + End If + If (Not (s2) Is Nothing) Then + s2.Close + End If + End Try + End If + xs.Add(dsSchema) + Return type + End Function + End Class + + ''' + '''Represents strongly named DataRow class. + ''' + Partial Public Class TBDD_CONNECTIONRow + Inherits Global.System.Data.DataRow + + Private tableTBDD_CONNECTION As TBDD_CONNECTIONDataTable + + _ + Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) + MyBase.New(rb) + Me.tableTBDD_CONNECTION = CType(Me.Table,TBDD_CONNECTIONDataTable) + End Sub + + _ + Public Property GUID() As Short + Get + Return CType(Me(Me.tableTBDD_CONNECTION.GUIDColumn),Short) + End Get + Set + Me(Me.tableTBDD_CONNECTION.GUIDColumn) = value + End Set + End Property + + _ + Public Property BEZEICHNUNG() As String + Get + Try + Return CType(Me(Me.tableTBDD_CONNECTION.BEZEICHNUNGColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte BEZEICHNUNG in Tabelle TBDD_CONNECTION ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBDD_CONNECTION.BEZEICHNUNGColumn) = value + End Set + End Property + + _ + Public Property SQL_PROVIDER() As String + Get + Try + Return CType(Me(Me.tableTBDD_CONNECTION.SQL_PROVIDERColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte SQL_PROVIDER in Tabelle TBDD_CONNECTION ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBDD_CONNECTION.SQL_PROVIDERColumn) = value + End Set + End Property + + _ + Public Property SERVER() As String + Get + Try + Return CType(Me(Me.tableTBDD_CONNECTION.SERVERColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte SERVER in Tabelle TBDD_CONNECTION ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBDD_CONNECTION.SERVERColumn) = value + End Set + End Property + + _ + Public Property DATENBANK() As String + Get + Try + Return CType(Me(Me.tableTBDD_CONNECTION.DATENBANKColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte DATENBANK in Tabelle TBDD_CONNECTION ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBDD_CONNECTION.DATENBANKColumn) = value + End Set + End Property + + _ + Public Property USERNAME() As String + Get + Try + Return CType(Me(Me.tableTBDD_CONNECTION.USERNAMEColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte USERNAME in Tabelle TBDD_CONNECTION ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBDD_CONNECTION.USERNAMEColumn) = value + End Set + End Property + + _ + Public Property PASSWORD() As String + Get + Try + Return CType(Me(Me.tableTBDD_CONNECTION.PASSWORDColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte PASSWORD in Tabelle TBDD_CONNECTION ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBDD_CONNECTION.PASSWORDColumn) = value + End Set + End Property + + _ + Public Property BEMERKUNG() As String + Get + Try + Return CType(Me(Me.tableTBDD_CONNECTION.BEMERKUNGColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte BEMERKUNG in Tabelle TBDD_CONNECTION ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBDD_CONNECTION.BEMERKUNGColumn) = value + End Set + End Property + + _ + Public Property AKTIV() As Boolean + Get + Return CType(Me(Me.tableTBDD_CONNECTION.AKTIVColumn),Boolean) + End Get + Set + Me(Me.tableTBDD_CONNECTION.AKTIVColumn) = value + End Set + End Property + + _ + Public Property ERSTELLTWER() As String + Get + Return CType(Me(Me.tableTBDD_CONNECTION.ERSTELLTWERColumn),String) + End Get + Set + Me(Me.tableTBDD_CONNECTION.ERSTELLTWERColumn) = value + End Set + End Property + + _ + Public Property ERSTELLTWANN() As Date + Get + Try + Return CType(Me(Me.tableTBDD_CONNECTION.ERSTELLTWANNColumn),Date) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ERSTELLTWANN in Tabelle TBDD_CONNECTION ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBDD_CONNECTION.ERSTELLTWANNColumn) = value + End Set + End Property + + _ + Public Property GEANDERTWER() As String + Get + Try + Return CType(Me(Me.tableTBDD_CONNECTION.GEANDERTWERColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte GEANDERTWER in Tabelle TBDD_CONNECTION ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBDD_CONNECTION.GEANDERTWERColumn) = value + End Set + End Property + + _ + Public Property GEAENDERTWANN() As Date + Get + Try + Return CType(Me(Me.tableTBDD_CONNECTION.GEAENDERTWANNColumn),Date) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte GEAENDERTWANN in Tabelle TBDD_CONNECTION ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBDD_CONNECTION.GEAENDERTWANNColumn) = value + End Set + End Property + + _ + Public Property SYS_CONNECTION() As Boolean + Get + Return CType(Me(Me.tableTBDD_CONNECTION.SYS_CONNECTIONColumn),Boolean) + End Get + Set + Me(Me.tableTBDD_CONNECTION.SYS_CONNECTIONColumn) = value + End Set + End Property + + _ + Public Function IsBEZEICHNUNGNull() As Boolean + Return Me.IsNull(Me.tableTBDD_CONNECTION.BEZEICHNUNGColumn) + End Function + + _ + Public Sub SetBEZEICHNUNGNull() + Me(Me.tableTBDD_CONNECTION.BEZEICHNUNGColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsSQL_PROVIDERNull() As Boolean + Return Me.IsNull(Me.tableTBDD_CONNECTION.SQL_PROVIDERColumn) + End Function + + _ + Public Sub SetSQL_PROVIDERNull() + Me(Me.tableTBDD_CONNECTION.SQL_PROVIDERColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsSERVERNull() As Boolean + Return Me.IsNull(Me.tableTBDD_CONNECTION.SERVERColumn) + End Function + + _ + Public Sub SetSERVERNull() + Me(Me.tableTBDD_CONNECTION.SERVERColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsDATENBANKNull() As Boolean + Return Me.IsNull(Me.tableTBDD_CONNECTION.DATENBANKColumn) + End Function + + _ + Public Sub SetDATENBANKNull() + Me(Me.tableTBDD_CONNECTION.DATENBANKColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsUSERNAMENull() As Boolean + Return Me.IsNull(Me.tableTBDD_CONNECTION.USERNAMEColumn) + End Function + + _ + Public Sub SetUSERNAMENull() + Me(Me.tableTBDD_CONNECTION.USERNAMEColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsPASSWORDNull() As Boolean + Return Me.IsNull(Me.tableTBDD_CONNECTION.PASSWORDColumn) + End Function + + _ + Public Sub SetPASSWORDNull() + Me(Me.tableTBDD_CONNECTION.PASSWORDColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsBEMERKUNGNull() As Boolean + Return Me.IsNull(Me.tableTBDD_CONNECTION.BEMERKUNGColumn) + End Function + + _ + Public Sub SetBEMERKUNGNull() + Me(Me.tableTBDD_CONNECTION.BEMERKUNGColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsERSTELLTWANNNull() As Boolean + Return Me.IsNull(Me.tableTBDD_CONNECTION.ERSTELLTWANNColumn) + End Function + + _ + Public Sub SetERSTELLTWANNNull() + Me(Me.tableTBDD_CONNECTION.ERSTELLTWANNColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsGEANDERTWERNull() As Boolean + Return Me.IsNull(Me.tableTBDD_CONNECTION.GEANDERTWERColumn) + End Function + + _ + Public Sub SetGEANDERTWERNull() + Me(Me.tableTBDD_CONNECTION.GEANDERTWERColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsGEAENDERTWANNNull() As Boolean + Return Me.IsNull(Me.tableTBDD_CONNECTION.GEAENDERTWANNColumn) + End Function + + _ + Public Sub SetGEAENDERTWANNNull() + Me(Me.tableTBDD_CONNECTION.GEAENDERTWANNColumn) = Global.System.Convert.DBNull + End Sub + End Class + + ''' + '''Row event argument class + ''' + _ + Public Class TBDD_CONNECTIONRowChangeEvent + Inherits Global.System.EventArgs + + Private eventRow As TBDD_CONNECTIONRow + + Private eventAction As Global.System.Data.DataRowAction + + _ + Public Sub New(ByVal row As TBDD_CONNECTIONRow, ByVal action As Global.System.Data.DataRowAction) + MyBase.New + Me.eventRow = row + Me.eventAction = action + End Sub + + _ + Public ReadOnly Property Row() As TBDD_CONNECTIONRow + Get + Return Me.eventRow + End Get + End Property + + _ + Public ReadOnly Property Action() As Global.System.Data.DataRowAction + Get + Return Me.eventAction + End Get + End Property + End Class +End Class + +Namespace DSDD_StammdatenTableAdapters + + ''' + '''Represents the connection and commands used to retrieve and save data. + ''' + _ + Partial Public Class TBDD_CONNECTIONTableAdapter + Inherits Global.System.ComponentModel.Component + + Private WithEvents _adapter As Global.System.Data.SqlClient.SqlDataAdapter + + Private _connection As Global.System.Data.SqlClient.SqlConnection + + Private _transaction As Global.System.Data.SqlClient.SqlTransaction + + Private _commandCollection() As Global.System.Data.SqlClient.SqlCommand + + Private _clearBeforeFill As Boolean + + _ + Public Sub New() + MyBase.New + Me.ClearBeforeFill = true + End Sub + + _ + Protected Friend ReadOnly Property Adapter() As Global.System.Data.SqlClient.SqlDataAdapter + Get + If (Me._adapter Is Nothing) Then + Me.InitAdapter + End If + Return Me._adapter + End Get + End Property + + _ + Friend Property Connection() As Global.System.Data.SqlClient.SqlConnection + Get + If (Me._connection Is Nothing) Then + Me.InitConnection + End If + Return Me._connection + End Get + Set + Me._connection = value + If (Not (Me.Adapter.InsertCommand) Is Nothing) Then + Me.Adapter.InsertCommand.Connection = value + End If + If (Not (Me.Adapter.DeleteCommand) Is Nothing) Then + Me.Adapter.DeleteCommand.Connection = value + End If + If (Not (Me.Adapter.UpdateCommand) Is Nothing) Then + Me.Adapter.UpdateCommand.Connection = value + End If + Dim i As Integer = 0 + Do While (i < Me.CommandCollection.Length) + If (Not (Me.CommandCollection(i)) Is Nothing) Then + CType(Me.CommandCollection(i),Global.System.Data.SqlClient.SqlCommand).Connection = value + End If + i = (i + 1) + Loop + End Set + End Property + + _ + Friend Property Transaction() As Global.System.Data.SqlClient.SqlTransaction + Get + Return Me._transaction + End Get + Set + Me._transaction = value + Dim i As Integer = 0 + Do While (i < Me.CommandCollection.Length) + Me.CommandCollection(i).Transaction = Me._transaction + i = (i + 1) + Loop + If ((Not (Me.Adapter) Is Nothing) _ + AndAlso (Not (Me.Adapter.DeleteCommand) Is Nothing)) Then + Me.Adapter.DeleteCommand.Transaction = Me._transaction + End If + If ((Not (Me.Adapter) Is Nothing) _ + AndAlso (Not (Me.Adapter.InsertCommand) Is Nothing)) Then + Me.Adapter.InsertCommand.Transaction = Me._transaction + End If + If ((Not (Me.Adapter) Is Nothing) _ + AndAlso (Not (Me.Adapter.UpdateCommand) Is Nothing)) Then + Me.Adapter.UpdateCommand.Transaction = Me._transaction + End If + End Set + End Property + + _ + Protected ReadOnly Property CommandCollection() As Global.System.Data.SqlClient.SqlCommand() + Get + If (Me._commandCollection Is Nothing) Then + Me.InitCommandCollection + End If + Return Me._commandCollection + End Get + End Property + + _ + Public Property ClearBeforeFill() As Boolean + Get + Return Me._clearBeforeFill + End Get + Set + Me._clearBeforeFill = value + End Set + End Property + + _ + Private Sub InitAdapter() + Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() + Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() + tableMapping.SourceTable = "Table" + tableMapping.DataSetTable = "TBDD_CONNECTION" + tableMapping.ColumnMappings.Add("GUID", "GUID") + tableMapping.ColumnMappings.Add("BEZEICHNUNG", "BEZEICHNUNG") + tableMapping.ColumnMappings.Add("SQL_PROVIDER", "SQL_PROVIDER") + tableMapping.ColumnMappings.Add("SERVER", "SERVER") + tableMapping.ColumnMappings.Add("DATENBANK", "DATENBANK") + tableMapping.ColumnMappings.Add("USERNAME", "USERNAME") + tableMapping.ColumnMappings.Add("PASSWORD", "PASSWORD") + tableMapping.ColumnMappings.Add("BEMERKUNG", "BEMERKUNG") + tableMapping.ColumnMappings.Add("AKTIV", "AKTIV") + tableMapping.ColumnMappings.Add("ERSTELLTWER", "ERSTELLTWER") + tableMapping.ColumnMappings.Add("ERSTELLTWANN", "ERSTELLTWANN") + tableMapping.ColumnMappings.Add("GEANDERTWER", "GEANDERTWER") + tableMapping.ColumnMappings.Add("GEAENDERTWANN", "GEAENDERTWANN") + tableMapping.ColumnMappings.Add("SYS_CONNECTION", "SYS_CONNECTION") + Me._adapter.TableMappings.Add(tableMapping) + Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() + Me._adapter.DeleteCommand.Connection = Me.Connection + Me._adapter.DeleteCommand.CommandText = "DELETE FROM [TBDD_CONNECTION] WHERE (([GUID] = @Original_GUID) AND ((@IsNull_BEZE"& _ + "ICHNUNG = 1 AND [BEZEICHNUNG] IS NULL) OR ([BEZEICHNUNG] = @Original_BEZEICHNUNG"& _ + ")) AND ((@IsNull_SQL_PROVIDER = 1 AND [SQL_PROVIDER] IS NULL) OR ([SQL_PROVIDER]"& _ + " = @Original_SQL_PROVIDER)) AND ((@IsNull_SERVER = 1 AND [SERVER] IS NULL) OR (["& _ + "SERVER] = @Original_SERVER)) AND ((@IsNull_DATENBANK = 1 AND [DATENBANK] IS NULL"& _ + ") OR ([DATENBANK] = @Original_DATENBANK)) AND ((@IsNull_USERNAME = 1 AND [USERNA"& _ + "ME] IS NULL) OR ([USERNAME] = @Original_USERNAME)) AND ((@IsNull_PASSWORD = 1 AN"& _ + "D [PASSWORD] IS NULL) OR ([PASSWORD] = @Original_PASSWORD)) AND ((@IsNull_BEMERK"& _ + "UNG = 1 AND [BEMERKUNG] IS NULL) OR ([BEMERKUNG] = @Original_BEMERKUNG)) AND ([A"& _ + "KTIV] = @Original_AKTIV) AND ([ERSTELLTWER] = @Original_ERSTELLTWER) AND ((@IsNu"& _ + "ll_ERSTELLTWANN = 1 AND [ERSTELLTWANN] IS NULL) OR ([ERSTELLTWANN] = @Original_E"& _ + "RSTELLTWANN)) AND ((@IsNull_GEANDERTWER = 1 AND [GEANDERTWER] IS NULL) OR ([GEAN"& _ + "DERTWER] = @Original_GEANDERTWER)) AND ((@IsNull_GEAENDERTWANN = 1 AND [GEAENDER"& _ + "TWANN] IS NULL) OR ([GEAENDERTWANN] = @Original_GEAENDERTWANN)) AND ([SYS_CONNEC"& _ + "TION] = @Original_SYS_CONNECTION))" + Me._adapter.DeleteCommand.CommandType = Global.System.Data.CommandType.Text + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.SmallInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_BEZEICHNUNG", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "BEZEICHNUNG", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_BEZEICHNUNG", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "BEZEICHNUNG", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_SQL_PROVIDER", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_PROVIDER", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_SQL_PROVIDER", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_PROVIDER", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_SERVER", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SERVER", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_SERVER", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SERVER", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_DATENBANK", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "DATENBANK", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_DATENBANK", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "DATENBANK", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_USERNAME", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "USERNAME", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_USERNAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "USERNAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_PASSWORD", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PASSWORD", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PASSWORD", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PASSWORD", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_BEMERKUNG", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "BEMERKUNG", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_BEMERKUNG", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "BEMERKUNG", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_AKTIV", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "AKTIV", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ERSTELLTWER", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ERSTELLTWER", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_ERSTELLTWANN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ERSTELLTWANN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ERSTELLTWANN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ERSTELLTWANN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_GEANDERTWER", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GEANDERTWER", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GEANDERTWER", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GEANDERTWER", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_GEAENDERTWANN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GEAENDERTWANN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GEAENDERTWANN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GEAENDERTWANN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_SYS_CONNECTION", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SYS_CONNECTION", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand() + Me._adapter.InsertCommand.Connection = Me.Connection + Me._adapter.InsertCommand.CommandText = "INSERT INTO [TBDD_CONNECTION] ([BEZEICHNUNG], [SQL_PROVIDER], [SERVER], [DATENBAN"& _ + "K], [USERNAME], [PASSWORD], [BEMERKUNG], [AKTIV], [ERSTELLTWER], [ERSTELLTWANN],"& _ + " [GEANDERTWER], [GEAENDERTWANN], [SYS_CONNECTION]) VALUES (@BEZEICHNUNG, @SQL_PR"& _ + "OVIDER, @SERVER, @DATENBANK, @USERNAME, @PASSWORD, @BEMERKUNG, @AKTIV, @ERSTELLT"& _ + "WER, @ERSTELLTWANN, @GEANDERTWER, @GEAENDERTWANN, @SYS_CONNECTION);"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID"& _ + ", BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, BEMERKUNG, A"& _ + "KTIV, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN, SYS_CONNECTION FROM"& _ + " TBDD_CONNECTION WHERE (GUID = SCOPE_IDENTITY())" + Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@BEZEICHNUNG", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "BEZEICHNUNG", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_PROVIDER", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_PROVIDER", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SERVER", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SERVER", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DATENBANK", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "DATENBANK", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USERNAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "USERNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PASSWORD", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PASSWORD", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@BEMERKUNG", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "BEMERKUNG", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@AKTIV", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "AKTIV", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ERSTELLTWER", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ERSTELLTWER", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ERSTELLTWANN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ERSTELLTWANN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GEANDERTWER", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GEANDERTWER", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GEAENDERTWANN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GEAENDERTWANN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SYS_CONNECTION", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SYS_CONNECTION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand() + Me._adapter.UpdateCommand.Connection = Me.Connection + Me._adapter.UpdateCommand.CommandText = "UPDATE TBDD_CONNECTION"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET BEZEICHNUNG = @BEZEICHNUNG, SQL_"& _ + "PROVIDER = @SQL_PROVIDER, SERVER = @SERVER, DATENBANK = @DATENBANK, USERNAME = @"& _ + "USERNAME, PASSWORD = @PASSWORD, BEMERKUNG = @BEMERKUNG, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ + " AKTIV = @AKTIV, ERSTELLTWER = @ERSTELLTWER, ERSTELLTWANN = @ERSTELLTWANN, GEA"& _ + "NDERTWER = @GEANDERTWER, GEAENDERTWANN = @GEAENDERTWANN, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ + " SYS_CONNECTION = @SYS_CONNECTION"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SE"& _ + "LECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, BEM"& _ + "ERKUNG, AKTIV, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN, SYS_CONNEC"& _ + "TION FROM TBDD_CONNECTION WHERE (GUID = @GUID)" + Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@BEZEICHNUNG", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "BEZEICHNUNG", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_PROVIDER", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_PROVIDER", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SERVER", Global.System.Data.SqlDbType.VarChar, 150, Global.System.Data.ParameterDirection.Input, 0, 0, "SERVER", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DATENBANK", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "DATENBANK", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USERNAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "USERNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PASSWORD", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "PASSWORD", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@BEMERKUNG", Global.System.Data.SqlDbType.VarChar, 400, Global.System.Data.ParameterDirection.Input, 0, 0, "BEMERKUNG", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@AKTIV", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "AKTIV", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ERSTELLTWER", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "ERSTELLTWER", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ERSTELLTWANN", Global.System.Data.SqlDbType.DateTime, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "ERSTELLTWANN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GEANDERTWER", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "GEANDERTWER", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GEAENDERTWANN", Global.System.Data.SqlDbType.DateTime, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "GEAENDERTWANN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SYS_CONNECTION", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "SYS_CONNECTION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + End Sub + + _ + Private Sub InitConnection() + Me._connection = New Global.System.Data.SqlClient.SqlConnection() + Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.DD_ECM_TESTConnectionString + End Sub + + _ + Private Sub InitCommandCollection() + Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {} + Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() + Me._commandCollection(0).Connection = Me.Connection + Me._commandCollection(0).CommandText = "SELECT * FROM TBDD_CONNECTION" + Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text + End Sub + + _ + Public Overloads Overridable Function Fill(ByVal dataTable As DSDD_Stammdaten.TBDD_CONNECTIONDataTable) As Integer + Me.Adapter.SelectCommand = Me.CommandCollection(0) + If (Me.ClearBeforeFill = true) Then + dataTable.Clear + End If + Dim returnValue As Integer = Me.Adapter.Fill(dataTable) + Return returnValue + End Function + + _ + Public Overloads Overridable Function GetData() As DSDD_Stammdaten.TBDD_CONNECTIONDataTable + Me.Adapter.SelectCommand = Me.CommandCollection(0) + Dim dataTable As DSDD_Stammdaten.TBDD_CONNECTIONDataTable = New DSDD_Stammdaten.TBDD_CONNECTIONDataTable() + Me.Adapter.Fill(dataTable) + Return dataTable + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataTable As DSDD_Stammdaten.TBDD_CONNECTIONDataTable) As Integer + Return Me.Adapter.Update(dataTable) + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataSet As DSDD_Stammdaten) As Integer + Return Me.Adapter.Update(dataSet, "TBDD_CONNECTION") + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataRow As Global.System.Data.DataRow) As Integer + Return Me.Adapter.Update(New Global.System.Data.DataRow() {dataRow}) + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataRows() As Global.System.Data.DataRow) As Integer + Return Me.Adapter.Update(dataRows) + End Function + End Class + + ''' + '''TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios + ''' + _ + Partial Public Class TableAdapterManager + Inherits Global.System.ComponentModel.Component + + Private _updateOrder As UpdateOrderOption + + Private _tBDD_CONNECTIONTableAdapter As TBDD_CONNECTIONTableAdapter + + Private _backupDataSetBeforeUpdate As Boolean + + Private _connection As Global.System.Data.IDbConnection + + _ + Public Property UpdateOrder() As UpdateOrderOption + Get + Return Me._updateOrder + End Get + Set + Me._updateOrder = value + End Set + End Property + + _ + Public Property TBDD_CONNECTIONTableAdapter() As TBDD_CONNECTIONTableAdapter + Get + Return Me._tBDD_CONNECTIONTableAdapter + End Get + Set + Me._tBDD_CONNECTIONTableAdapter = value + End Set + End Property + + _ + Public Property BackupDataSetBeforeUpdate() As Boolean + Get + Return Me._backupDataSetBeforeUpdate + End Get + Set + Me._backupDataSetBeforeUpdate = value + End Set + End Property + + _ + Public Property Connection() As Global.System.Data.IDbConnection + Get + If (Not (Me._connection) Is Nothing) Then + Return Me._connection + End If + If ((Not (Me._tBDD_CONNECTIONTableAdapter) Is Nothing) _ + AndAlso (Not (Me._tBDD_CONNECTIONTableAdapter.Connection) Is Nothing)) Then + Return Me._tBDD_CONNECTIONTableAdapter.Connection + End If + Return Nothing + End Get + Set + Me._connection = value + End Set + End Property + + _ + Public ReadOnly Property TableAdapterInstanceCount() As Integer + Get + Dim count As Integer = 0 + If (Not (Me._tBDD_CONNECTIONTableAdapter) Is Nothing) Then + count = (count + 1) + End If + Return count + End Get + End Property + + ''' + '''Update rows in top-down order. + ''' + _ + Private Function UpdateUpdatedRows(ByVal dataSet As DSDD_Stammdaten, ByVal allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow), ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer + Dim result As Integer = 0 + If (Not (Me._tBDD_CONNECTIONTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBDD_CONNECTION.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) + If ((Not (updatedRows) Is Nothing) _ + AndAlso (0 < updatedRows.Length)) Then + result = (result + Me._tBDD_CONNECTIONTableAdapter.Update(updatedRows)) + allChangedRows.AddRange(updatedRows) + End If + End If + Return result + End Function + + ''' + '''Insert rows in top-down order. + ''' + _ + Private Function UpdateInsertedRows(ByVal dataSet As DSDD_Stammdaten, ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer + Dim result As Integer = 0 + If (Not (Me._tBDD_CONNECTIONTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBDD_CONNECTION.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If ((Not (addedRows) Is Nothing) _ + AndAlso (0 < addedRows.Length)) Then + result = (result + Me._tBDD_CONNECTIONTableAdapter.Update(addedRows)) + allAddedRows.AddRange(addedRows) + End If + End If + Return result + End Function + + ''' + '''Delete rows in bottom-up order. + ''' + _ + Private Function UpdateDeletedRows(ByVal dataSet As DSDD_Stammdaten, ByVal allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer + Dim result As Integer = 0 + If (Not (Me._tBDD_CONNECTIONTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBDD_CONNECTION.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If ((Not (deletedRows) Is Nothing) _ + AndAlso (0 < deletedRows.Length)) Then + result = (result + Me._tBDD_CONNECTIONTableAdapter.Update(deletedRows)) + allChangedRows.AddRange(deletedRows) + End If + End If + Return result + End Function + + ''' + '''Remove inserted rows that become updated rows after calling TableAdapter.Update(inserted rows) first + ''' + _ + Private Function GetRealUpdatedRows(ByVal updatedRows() As Global.System.Data.DataRow, ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Global.System.Data.DataRow() + If ((updatedRows Is Nothing) _ + OrElse (updatedRows.Length < 1)) Then + Return updatedRows + End If + If ((allAddedRows Is Nothing) _ + OrElse (allAddedRows.Count < 1)) Then + Return updatedRows + End If + Dim realUpdatedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow) = New Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)() + Dim i As Integer = 0 + Do While (i < updatedRows.Length) + Dim row As Global.System.Data.DataRow = updatedRows(i) + If (allAddedRows.Contains(row) = false) Then + realUpdatedRows.Add(row) + End If + i = (i + 1) + Loop + Return realUpdatedRows.ToArray + End Function + + ''' + '''Update all changes to the dataset. + ''' + _ + Public Overridable Function UpdateAll(ByVal dataSet As DSDD_Stammdaten) As Integer + If (dataSet Is Nothing) Then + Throw New Global.System.ArgumentNullException("dataSet") + End If + If (dataSet.HasChanges = false) Then + Return 0 + End If + If ((Not (Me._tBDD_CONNECTIONTableAdapter) Is Nothing) _ + AndAlso (Me.MatchTableAdapterConnection(Me._tBDD_CONNECTIONTableAdapter.Connection) = false)) Then + Throw New Global.System.ArgumentException("Für alle von einem TableAdapterManager verwalteten Instanzen von TableAdapter mus"& _ + "s die gleiche Verbindungszeichenfolge verwendet werden.") + End If + Dim workConnection As Global.System.Data.IDbConnection = Me.Connection + If (workConnection Is Nothing) Then + Throw New Global.System.ApplicationException("TableAdapterManager enthält keine Verbindungsinformationen. Legen Sie jede TableA"& _ + "dapterManager TableAdapter-Eigenschaft auf eine gültige TableAdapter-Instanz fes"& _ + "t.") + End If + Dim workConnOpened As Boolean = false + If ((workConnection.State And Global.System.Data.ConnectionState.Broken) _ + = Global.System.Data.ConnectionState.Broken) Then + workConnection.Close + End If + If (workConnection.State = Global.System.Data.ConnectionState.Closed) Then + workConnection.Open + workConnOpened = true + End If + Dim workTransaction As Global.System.Data.IDbTransaction = workConnection.BeginTransaction + If (workTransaction Is Nothing) Then + Throw New Global.System.ApplicationException("Die Transaktion kann nicht gestartet werden. Die aktuelle Datenverbindung unterst"& _ + "ützt keine Transaktionen, oder der aktuelle Zustand lässt den Start der Transakt"& _ + "ion nicht zu.") + End If + Dim allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow) = New Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)() + Dim allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow) = New Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)() + Dim adaptersWithAcceptChangesDuringUpdate As Global.System.Collections.Generic.List(Of Global.System.Data.Common.DataAdapter) = New Global.System.Collections.Generic.List(Of Global.System.Data.Common.DataAdapter)() + Dim revertConnections As Global.System.Collections.Generic.Dictionary(Of Object, Global.System.Data.IDbConnection) = New Global.System.Collections.Generic.Dictionary(Of Object, Global.System.Data.IDbConnection)() + Dim result As Integer = 0 + Dim backupDataSet As Global.System.Data.DataSet = Nothing + If Me.BackupDataSetBeforeUpdate Then + backupDataSet = New Global.System.Data.DataSet() + backupDataSet.Merge(dataSet) + End If + Try + '---- Prepare for update ----------- + ' + If (Not (Me._tBDD_CONNECTIONTableAdapter) Is Nothing) Then + revertConnections.Add(Me._tBDD_CONNECTIONTableAdapter, Me._tBDD_CONNECTIONTableAdapter.Connection) + Me._tBDD_CONNECTIONTableAdapter.Connection = CType(workConnection,Global.System.Data.SqlClient.SqlConnection) + Me._tBDD_CONNECTIONTableAdapter.Transaction = CType(workTransaction,Global.System.Data.SqlClient.SqlTransaction) + If Me._tBDD_CONNECTIONTableAdapter.Adapter.AcceptChangesDuringUpdate Then + Me._tBDD_CONNECTIONTableAdapter.Adapter.AcceptChangesDuringUpdate = false + adaptersWithAcceptChangesDuringUpdate.Add(Me._tBDD_CONNECTIONTableAdapter.Adapter) + End If + End If + ' + '---- Perform updates ----------- + ' + If (Me.UpdateOrder = UpdateOrderOption.UpdateInsertDelete) Then + result = (result + Me.UpdateUpdatedRows(dataSet, allChangedRows, allAddedRows)) + result = (result + Me.UpdateInsertedRows(dataSet, allAddedRows)) + Else + result = (result + Me.UpdateInsertedRows(dataSet, allAddedRows)) + result = (result + Me.UpdateUpdatedRows(dataSet, allChangedRows, allAddedRows)) + End If + result = (result + Me.UpdateDeletedRows(dataSet, allChangedRows)) + ' + '---- Commit updates ----------- + ' + workTransaction.Commit + If (0 < allAddedRows.Count) Then + Dim rows((allAddedRows.Count) - 1) As Global.System.Data.DataRow + allAddedRows.CopyTo(rows) + Dim i As Integer = 0 + Do While (i < rows.Length) + Dim row As Global.System.Data.DataRow = rows(i) + row.AcceptChanges + i = (i + 1) + Loop + End If + If (0 < allChangedRows.Count) Then + Dim rows((allChangedRows.Count) - 1) As Global.System.Data.DataRow + allChangedRows.CopyTo(rows) + Dim i As Integer = 0 + Do While (i < rows.Length) + Dim row As Global.System.Data.DataRow = rows(i) + row.AcceptChanges + i = (i + 1) + Loop + End If + Catch ex As Global.System.Exception + workTransaction.Rollback + '---- Restore the dataset ----------- + If Me.BackupDataSetBeforeUpdate Then + Global.System.Diagnostics.Debug.Assert((Not (backupDataSet) Is Nothing)) + dataSet.Clear + dataSet.Merge(backupDataSet) + Else + If (0 < allAddedRows.Count) Then + Dim rows((allAddedRows.Count) - 1) As Global.System.Data.DataRow + allAddedRows.CopyTo(rows) + Dim i As Integer = 0 + Do While (i < rows.Length) + Dim row As Global.System.Data.DataRow = rows(i) + row.AcceptChanges + row.SetAdded + i = (i + 1) + Loop + End If + End If + Throw ex + Finally + If workConnOpened Then + workConnection.Close + End If + If (Not (Me._tBDD_CONNECTIONTableAdapter) Is Nothing) Then + Me._tBDD_CONNECTIONTableAdapter.Connection = CType(revertConnections(Me._tBDD_CONNECTIONTableAdapter),Global.System.Data.SqlClient.SqlConnection) + Me._tBDD_CONNECTIONTableAdapter.Transaction = Nothing + End If + If (0 < adaptersWithAcceptChangesDuringUpdate.Count) Then + Dim adapters((adaptersWithAcceptChangesDuringUpdate.Count) - 1) As Global.System.Data.Common.DataAdapter + adaptersWithAcceptChangesDuringUpdate.CopyTo(adapters) + Dim i As Integer = 0 + Do While (i < adapters.Length) + Dim adapter As Global.System.Data.Common.DataAdapter = adapters(i) + adapter.AcceptChangesDuringUpdate = true + i = (i + 1) + Loop + End If + End Try + Return result + End Function + + _ + Protected Overridable Sub SortSelfReferenceRows(ByVal rows() As Global.System.Data.DataRow, ByVal relation As Global.System.Data.DataRelation, ByVal childFirst As Boolean) + Global.System.Array.Sort(Of Global.System.Data.DataRow)(rows, New SelfReferenceComparer(relation, childFirst)) + End Sub + + _ + Protected Overridable Function MatchTableAdapterConnection(ByVal inputConnection As Global.System.Data.IDbConnection) As Boolean + If (Not (Me._connection) Is Nothing) Then + Return true + End If + If ((Me.Connection Is Nothing) _ + OrElse (inputConnection Is Nothing)) Then + Return true + End If + If String.Equals(Me.Connection.ConnectionString, inputConnection.ConnectionString, Global.System.StringComparison.Ordinal) Then + Return true + End If + Return false + End Function + + ''' + '''Update Order Option + ''' + _ + Public Enum UpdateOrderOption + + InsertUpdateDelete = 0 + + UpdateInsertDelete = 1 + End Enum + + ''' + '''Used to sort self-referenced table's rows + ''' + _ + Private Class SelfReferenceComparer + Inherits Object + Implements Global.System.Collections.Generic.IComparer(Of Global.System.Data.DataRow) + + Private _relation As Global.System.Data.DataRelation + + Private _childFirst As Integer + + _ + Friend Sub New(ByVal relation As Global.System.Data.DataRelation, ByVal childFirst As Boolean) + MyBase.New + Me._relation = relation + If childFirst Then + Me._childFirst = -1 + Else + Me._childFirst = 1 + End If + End Sub + + _ + Private Function GetRoot(ByVal row As Global.System.Data.DataRow, ByRef distance As Integer) As Global.System.Data.DataRow + Global.System.Diagnostics.Debug.Assert((Not (row) Is Nothing)) + Dim root As Global.System.Data.DataRow = row + distance = 0 + + Dim traversedRows As Global.System.Collections.Generic.IDictionary(Of Global.System.Data.DataRow, Global.System.Data.DataRow) = New Global.System.Collections.Generic.Dictionary(Of Global.System.Data.DataRow, Global.System.Data.DataRow)() + traversedRows(row) = row + + Dim parent As Global.System.Data.DataRow = row.GetParentRow(Me._relation, Global.System.Data.DataRowVersion.[Default]) + + Do While ((Not (parent) Is Nothing) _ + AndAlso (traversedRows.ContainsKey(parent) = false)) + distance = (distance + 1) + root = parent + traversedRows(parent) = parent + parent = parent.GetParentRow(Me._relation, Global.System.Data.DataRowVersion.[Default]) + + Loop + + If (distance = 0) Then + traversedRows.Clear + traversedRows(row) = row + parent = row.GetParentRow(Me._relation, Global.System.Data.DataRowVersion.Original) + + Do While ((Not (parent) Is Nothing) _ + AndAlso (traversedRows.ContainsKey(parent) = false)) + distance = (distance + 1) + root = parent + traversedRows(parent) = parent + parent = parent.GetParentRow(Me._relation, Global.System.Data.DataRowVersion.Original) + + Loop + End If + + Return root + End Function + + _ + Public Function Compare(ByVal row1 As Global.System.Data.DataRow, ByVal row2 As Global.System.Data.DataRow) As Integer Implements Global.System.Collections.Generic.IComparer(Of Global.System.Data.DataRow).Compare + If Object.ReferenceEquals(row1, row2) Then + Return 0 + End If + If (row1 Is Nothing) Then + Return -1 + End If + If (row2 Is Nothing) Then + Return 1 + End If + + Dim distance1 As Integer = 0 + Dim root1 As Global.System.Data.DataRow = Me.GetRoot(row1, distance1) + + Dim distance2 As Integer = 0 + Dim root2 As Global.System.Data.DataRow = Me.GetRoot(row2, distance2) + + If Object.ReferenceEquals(root1, root2) Then + Return (Me._childFirst * distance1.CompareTo(distance2)) + Else + Global.System.Diagnostics.Debug.Assert(((Not (root1.Table) Is Nothing) _ + AndAlso (Not (root2.Table) Is Nothing))) + If (root1.Table.Rows.IndexOf(root1) < root2.Table.Rows.IndexOf(root2)) Then + Return -1 + Else + Return 1 + End If + End If + End Function + End Class + End Class +End Namespace diff --git a/GUIs.ZooFlow/DSDD_Stammdaten.xsc b/GUIs.ZooFlow/DSDD_Stammdaten.xsc new file mode 100644 index 00000000..05b01991 --- /dev/null +++ b/GUIs.ZooFlow/DSDD_Stammdaten.xsc @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/DSDD_Stammdaten.xsd b/GUIs.ZooFlow/DSDD_Stammdaten.xsd new file mode 100644 index 00000000..08eba233 --- /dev/null +++ b/GUIs.ZooFlow/DSDD_Stammdaten.xsd @@ -0,0 +1,207 @@ + + + + + + + + + + + + + + + DELETE FROM [TBDD_CONNECTION] WHERE (([GUID] = @Original_GUID) AND ((@IsNull_BEZEICHNUNG = 1 AND [BEZEICHNUNG] IS NULL) OR ([BEZEICHNUNG] = @Original_BEZEICHNUNG)) AND ((@IsNull_SQL_PROVIDER = 1 AND [SQL_PROVIDER] IS NULL) OR ([SQL_PROVIDER] = @Original_SQL_PROVIDER)) AND ((@IsNull_SERVER = 1 AND [SERVER] IS NULL) OR ([SERVER] = @Original_SERVER)) AND ((@IsNull_DATENBANK = 1 AND [DATENBANK] IS NULL) OR ([DATENBANK] = @Original_DATENBANK)) AND ((@IsNull_USERNAME = 1 AND [USERNAME] IS NULL) OR ([USERNAME] = @Original_USERNAME)) AND ((@IsNull_PASSWORD = 1 AND [PASSWORD] IS NULL) OR ([PASSWORD] = @Original_PASSWORD)) AND ((@IsNull_BEMERKUNG = 1 AND [BEMERKUNG] IS NULL) OR ([BEMERKUNG] = @Original_BEMERKUNG)) AND ([AKTIV] = @Original_AKTIV) AND ([ERSTELLTWER] = @Original_ERSTELLTWER) AND ((@IsNull_ERSTELLTWANN = 1 AND [ERSTELLTWANN] IS NULL) OR ([ERSTELLTWANN] = @Original_ERSTELLTWANN)) AND ((@IsNull_GEANDERTWER = 1 AND [GEANDERTWER] IS NULL) OR ([GEANDERTWER] = @Original_GEANDERTWER)) AND ((@IsNull_GEAENDERTWANN = 1 AND [GEAENDERTWANN] IS NULL) OR ([GEAENDERTWANN] = @Original_GEAENDERTWANN)) AND ([SYS_CONNECTION] = @Original_SYS_CONNECTION)) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO [TBDD_CONNECTION] ([BEZEICHNUNG], [SQL_PROVIDER], [SERVER], [DATENBANK], [USERNAME], [PASSWORD], [BEMERKUNG], [AKTIV], [ERSTELLTWER], [ERSTELLTWANN], [GEANDERTWER], [GEAENDERTWANN], [SYS_CONNECTION]) VALUES (@BEZEICHNUNG, @SQL_PROVIDER, @SERVER, @DATENBANK, @USERNAME, @PASSWORD, @BEMERKUNG, @AKTIV, @ERSTELLTWER, @ERSTELLTWANN, @GEANDERTWER, @GEAENDERTWANN, @SYS_CONNECTION); +SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, BEMERKUNG, AKTIV, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN, SYS_CONNECTION FROM TBDD_CONNECTION WHERE (GUID = SCOPE_IDENTITY()) + + + + + + + + + + + + + + + + + + + + SELECT * FROM TBDD_CONNECTION + + + + + + UPDATE TBDD_CONNECTION +SET BEZEICHNUNG = @BEZEICHNUNG, SQL_PROVIDER = @SQL_PROVIDER, SERVER = @SERVER, DATENBANK = @DATENBANK, USERNAME = @USERNAME, PASSWORD = @PASSWORD, BEMERKUNG = @BEMERKUNG, + AKTIV = @AKTIV, ERSTELLTWER = @ERSTELLTWER, ERSTELLTWANN = @ERSTELLTWANN, GEANDERTWER = @GEANDERTWER, GEAENDERTWANN = @GEAENDERTWANN, + SYS_CONNECTION = @SYS_CONNECTION +WHERE (GUID = @Original_GUID); +SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, BEMERKUNG, AKTIV, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN, SYS_CONNECTION FROM TBDD_CONNECTION WHERE (GUID = @GUID) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/DSDD_Stammdaten.xss b/GUIs.ZooFlow/DSDD_Stammdaten.xss new file mode 100644 index 00000000..4a0db595 --- /dev/null +++ b/GUIs.ZooFlow/DSDD_Stammdaten.xss @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index d5a38f4e..86862a80 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -115,10 +115,10 @@ - - frmAdmin_CWProfile.vb + + frmAdmin_ClipboardWatcher.vb - + Form @@ -162,6 +162,11 @@ DBCW_Stammdaten.xsd + + True + True + DSDD_Stammdaten.xsd + DSIDB_Stammdaten.xsd @@ -306,8 +311,8 @@ - - frmAdmin_CWProfile.vb + + frmAdmin_ClipboardWatcher.vb frmAdmin_IDBAttribute.vb @@ -382,6 +387,17 @@ DBCW_Stammdaten.xsd + + DSDD_Stammdaten.xsd + + + Designer + MSDataSetGenerator + DSDD_Stammdaten.Designer.vb + + + DSDD_Stammdaten.xsd + MyDataset.xsd From d5448153fda26c213ccd0de231172b6829c655f3 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 3 May 2021 11:45:41 +0200 Subject: [PATCH 64/82] LookupGrid: Update licenses.licx --- Controls.LookupGrid/My Project/licenses.licx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Controls.LookupGrid/My Project/licenses.licx b/Controls.LookupGrid/My Project/licenses.licx index ca29cac8..86498625 100644 --- a/Controls.LookupGrid/My Project/licenses.licx +++ b/Controls.LookupGrid/My Project/licenses.licx @@ -1,3 +1,4 @@ +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.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.XtraEditors.Repository.RepositoryItemLookUpEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a From 42f9c04b244ffd1ac2ec64e46e3e954fdbc06cd8 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 3 May 2021 11:46:20 +0200 Subject: [PATCH 65/82] LookupGrid: 3.1.0.1 --- Controls.LookupGrid/My Project/AssemblyInfo.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Controls.LookupGrid/My Project/AssemblyInfo.vb b/Controls.LookupGrid/My Project/AssemblyInfo.vb index 8c5cb217..b6e9c065 100644 --- a/Controls.LookupGrid/My Project/AssemblyInfo.vb +++ b/Controls.LookupGrid/My Project/AssemblyInfo.vb @@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + From 5391bb8d79b5c0f5d13f7c8be64e0bc9719fbba8 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 4 May 2021 11:10:06 +0200 Subject: [PATCH 66/82] File: clean up GetChecksum --- Modules.Filesystem/File.vb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Modules.Filesystem/File.vb b/Modules.Filesystem/File.vb index e29f65d4..82f78f02 100644 --- a/Modules.Filesystem/File.vb +++ b/Modules.Filesystem/File.vb @@ -73,10 +73,11 @@ Public Class File End Function Public Function GetChecksum(FilePath As String) As String - Using oStream As New BufferedStream(IO.File.OpenRead(FilePath), 1200000) - Dim oSHA As New SHA256Managed() - Dim oChecksum() As Byte = oSHA.ComputeHash(oStream) - Return BitConverter.ToString(oChecksum).Replace("-", String.Empty) + Using oFileStream = IO.File.OpenRead(FilePath) + Using oStream As New BufferedStream(oFileStream, 1200000) + Dim oChecksum() As Byte = SHA256.Create.ComputeHash(oStream) + Return BitConverter.ToString(oChecksum).Replace("-", String.Empty) + End Using End Using End Function From e0df4da27d2c87f685172a666b30bb53c591d907 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 4 May 2021 11:10:32 +0200 Subject: [PATCH 67/82] Filesystem: Version 1.0.4 --- Modules.Filesystem/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules.Filesystem/My Project/AssemblyInfo.vb b/Modules.Filesystem/My Project/AssemblyInfo.vb index e0387a3b..57d6d325 100644 --- a/Modules.Filesystem/My Project/AssemblyInfo.vb +++ b/Modules.Filesystem/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + From baea2d07d34fc6bc16168589df3e3f4e7b9c1b1d Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 4 May 2021 14:42:11 +0200 Subject: [PATCH 68/82] Monitor/SQLConfig: Add Initial Project --- DDMonorepo.sln | 14 + GUIs.Monitor/Form1.Designer.vb | 76 +++++ GUIs.Monitor/Form1.resx | 120 ++++++++ GUIs.Monitor/Form1.vb | 6 + GUIs.Monitor/Monitor.vbproj | 137 +++++++++ .../My Project/Application.Designer.vb | 38 +++ GUIs.Monitor/My Project/Application.myapp | 11 + GUIs.Monitor/My Project/AssemblyInfo.vb | 36 +++ GUIs.Monitor/My Project/Resources.Designer.vb | 63 ++++ GUIs.Monitor/My Project/Resources.resx | 117 ++++++++ GUIs.Monitor/My Project/Settings.Designer.vb | 71 +++++ GUIs.Monitor/My Project/Settings.settings | 7 + GUIs.Monitor/My Project/licenses.licx | 1 + GUIs.Monitor/app.config | 41 +++ SQLConfig/App.config | 14 + SQLConfig/My Project/Application.Designer.vb | 38 +++ SQLConfig/My Project/Application.myapp | 10 + SQLConfig/My Project/AssemblyInfo.vb | 35 +++ SQLConfig/My Project/Resources.Designer.vb | 62 ++++ SQLConfig/My Project/Resources.resx | 117 ++++++++ SQLConfig/My Project/Settings.Designer.vb | 73 +++++ SQLConfig/My Project/Settings.settings | 7 + SQLConfig/My Project/licenses.licx | 4 + SQLConfig/SQLConfig.vbproj | 158 ++++++++++ SQLConfig/frmSQLConfig.Designer.vb | 271 ++++++++++++++++++ SQLConfig/frmSQLConfig.resx | 120 ++++++++ SQLConfig/frmSQLConfig.vb | 142 +++++++++ SQLConfig/packages.config | 4 + 28 files changed, 1793 insertions(+) create mode 100644 GUIs.Monitor/Form1.Designer.vb create mode 100644 GUIs.Monitor/Form1.resx create mode 100644 GUIs.Monitor/Form1.vb create mode 100644 GUIs.Monitor/Monitor.vbproj create mode 100644 GUIs.Monitor/My Project/Application.Designer.vb create mode 100644 GUIs.Monitor/My Project/Application.myapp create mode 100644 GUIs.Monitor/My Project/AssemblyInfo.vb create mode 100644 GUIs.Monitor/My Project/Resources.Designer.vb create mode 100644 GUIs.Monitor/My Project/Resources.resx create mode 100644 GUIs.Monitor/My Project/Settings.Designer.vb create mode 100644 GUIs.Monitor/My Project/Settings.settings create mode 100644 GUIs.Monitor/My Project/licenses.licx create mode 100644 GUIs.Monitor/app.config create mode 100644 SQLConfig/App.config create mode 100644 SQLConfig/My Project/Application.Designer.vb create mode 100644 SQLConfig/My Project/Application.myapp create mode 100644 SQLConfig/My Project/AssemblyInfo.vb create mode 100644 SQLConfig/My Project/Resources.Designer.vb create mode 100644 SQLConfig/My Project/Resources.resx create mode 100644 SQLConfig/My Project/Settings.Designer.vb create mode 100644 SQLConfig/My Project/Settings.settings create mode 100644 SQLConfig/My Project/licenses.licx create mode 100644 SQLConfig/SQLConfig.vbproj create mode 100644 SQLConfig/frmSQLConfig.Designer.vb create mode 100644 SQLConfig/frmSQLConfig.resx create mode 100644 SQLConfig/frmSQLConfig.vb create mode 100644 SQLConfig/packages.config diff --git a/DDMonorepo.sln b/DDMonorepo.sln index 38a35eba..b2d88dd7 100644 --- a/DDMonorepo.sln +++ b/DDMonorepo.sln @@ -128,6 +128,10 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "GlobalIndexer", "GUIs.Globa EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "SQLEditor", "Controls.SQLEditor\SQLEditor.vbproj", "{3E7BC8A9-91EF-49B8-8110-2C01F664C24A}" EndProject +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "SQLConfig", "SQLConfig\SQLConfig.vbproj", "{65EFB268-C0E0-40C1-8981-9F70DEE5C74A}" +EndProject +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Monitor", "GUIs.Monitor\Monitor.vbproj", "{E24E8D40-0361-4C07-8FAE-3621DE316E70}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -338,6 +342,14 @@ Global {3E7BC8A9-91EF-49B8-8110-2C01F664C24A}.Debug|Any CPU.Build.0 = Debug|Any CPU {3E7BC8A9-91EF-49B8-8110-2C01F664C24A}.Release|Any CPU.ActiveCfg = Release|Any CPU {3E7BC8A9-91EF-49B8-8110-2C01F664C24A}.Release|Any CPU.Build.0 = Release|Any CPU + {65EFB268-C0E0-40C1-8981-9F70DEE5C74A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {65EFB268-C0E0-40C1-8981-9F70DEE5C74A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {65EFB268-C0E0-40C1-8981-9F70DEE5C74A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {65EFB268-C0E0-40C1-8981-9F70DEE5C74A}.Release|Any CPU.Build.0 = Release|Any CPU + {E24E8D40-0361-4C07-8FAE-3621DE316E70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E24E8D40-0361-4C07-8FAE-3621DE316E70}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E24E8D40-0361-4C07-8FAE-3621DE316E70}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E24E8D40-0361-4C07-8FAE-3621DE316E70}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -394,6 +406,8 @@ Global {16857A4E-2609-47E6-9C35-7669D64DD040} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} {40384B94-1F94-4249-9A5A-D02E0B346738} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB} {3E7BC8A9-91EF-49B8-8110-2C01F664C24A} = {F98C0329-C004-417F-B2AB-7466E88D8220} + {65EFB268-C0E0-40C1-8981-9F70DEE5C74A} = {F98C0329-C004-417F-B2AB-7466E88D8220} + {E24E8D40-0361-4C07-8FAE-3621DE316E70} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C1BE4090-A0FD-48AF-86CB-39099D14B286} diff --git a/GUIs.Monitor/Form1.Designer.vb b/GUIs.Monitor/Form1.Designer.vb new file mode 100644 index 00000000..d1926fb6 --- /dev/null +++ b/GUIs.Monitor/Form1.Designer.vb @@ -0,0 +1,76 @@ +Imports DigitalData.GUIs.Common.Base + +Partial Public Class Form1 + Inherits BaseRibbonForm + + ''' + ''' Required designer variable. + ''' + Private components As System.ComponentModel.IContainer = Nothing + + ''' + ''' Clean up any resources being used. + ''' + ''' true if managed resources should be disposed; otherwise, false. + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + If disposing AndAlso (components IsNot Nothing) Then + components.Dispose() + End If + MyBase.Dispose(disposing) + End Sub + +#Region "Windows Form Designer generated code" + + ''' + ''' Required method for Designer support - do not modify + ''' the contents of this method with the code editor. + ''' + Private Sub InitializeComponent() + Me.ribbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.ribbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.ribbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + CType(Me.ribbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'ribbonControl1 + ' + Me.ribbonControl1.ExpandCollapseItem.Id = 0 + Me.ribbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonControl1.ExpandCollapseItem, Me.ribbonControl1.SearchEditItem}) + Me.ribbonControl1.Location = New System.Drawing.Point(0, 0) + Me.ribbonControl1.MaxItemId = 1 + Me.ribbonControl1.Name = "ribbonControl1" + Me.ribbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.ribbonPage1}) + Me.ribbonControl1.Size = New System.Drawing.Size(1034, 158) + ' + 'ribbonPage1 + ' + Me.ribbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.ribbonPageGroup1}) + Me.ribbonPage1.Name = "ribbonPage1" + Me.ribbonPage1.Text = "ribbonPage1" + ' + 'ribbonPageGroup1 + ' + Me.ribbonPageGroup1.Name = "ribbonPageGroup1" + Me.ribbonPageGroup1.Text = "ribbonPageGroup1" + ' + 'Form1 + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(1034, 619) + Me.Controls.Add(Me.ribbonControl1) + Me.Name = "Form1" + Me.Ribbon = Me.ribbonControl1 + Me.Text = "Monitor" + CType(Me.ribbonControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + +#End Region + + Private WithEvents ribbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl + Private WithEvents ribbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage + Private WithEvents ribbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup +End Class diff --git a/GUIs.Monitor/Form1.resx b/GUIs.Monitor/Form1.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/GUIs.Monitor/Form1.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/GUIs.Monitor/Form1.vb b/GUIs.Monitor/Form1.vb new file mode 100644 index 00000000..b3b74198 --- /dev/null +++ b/GUIs.Monitor/Form1.vb @@ -0,0 +1,6 @@ +Imports System.ComponentModel +Imports System.Text + + +Partial Public Class Form1 +End Class diff --git a/GUIs.Monitor/Monitor.vbproj b/GUIs.Monitor/Monitor.vbproj new file mode 100644 index 00000000..3840206d --- /dev/null +++ b/GUIs.Monitor/Monitor.vbproj @@ -0,0 +1,137 @@ + + + Debug + x86 + 8.0.30703 + 2.0 + {E24E8D40-0361-4C07-8FAE-3621DE316E70} + WinExe + DigitalData.GUIs.Monitor + DigitalData.GUIs.Monitor + v4.5.2 + Monitor.Program + 512 + On + Binary + Off + On + + + AnyCPU + true + full + false + bin\Debug\ + true + true + prompt + + + AnyCPU + pdbonly + true + bin\Release\ + false + true + prompt + + + WindowsForms + + + DigitalData.GUIs.Monitor.My.MyApplication + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Form + + + Form1.vb + + + True + Application.myapp + True + + + + Form1.vb + + + + VbMyResourcesResXFileCodeGenerator + Resources.Designer.vb + My.Resources + Designer + + + True + Resources.resx + True + + + + SettingsSingleFileGenerator + Settings.Designer.vb + + + True + Settings.settings + True + + + + + MyApplicationCodeGenerator + Application.Designer.vb + + + + + {d20a6bf2-c7c6-4a7a-b34d-fa27d775a049} + Common + + + {65efb268-c0e0-40c1-8981-9f70dee5c74a} + SQLConfig + + + + + \ No newline at end of file diff --git a/GUIs.Monitor/My Project/Application.Designer.vb b/GUIs.Monitor/My Project/Application.Designer.vb new file mode 100644 index 00000000..ed856bf0 --- /dev/null +++ b/GUIs.Monitor/My Project/Application.Designer.vb @@ -0,0 +1,38 @@ +'------------------------------------------------------------------------------ +' +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 +' +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + + +Namespace My + + 'HINWEIS: Diese Datei wird automatisch generiert und darf nicht direkt bearbeitet werden. Wenn Sie Änderungen vornehmen möchten + ' oder in dieser Datei Buildfehler auftreten, wechseln Sie zum Projekt-Designer. + ' (Wechseln Sie dazu zu den Projekteigenschaften, oder doppelklicken Sie auf den Knoten "Mein Projekt" im + ' Projektmappen-Explorer). Nehmen Sie auf der Registerkarte "Anwendung" entsprechende Änderungen vor. + ' + Partial Friend Class MyApplication + + _ + Public Sub New() + MyBase.New(Global.Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows) + Me.IsSingleInstance = false + Me.EnableVisualStyles = true + Me.SaveMySettingsOnExit = true + Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses + End Sub + + _ + Protected Overrides Sub OnCreateMainForm() + Me.MainForm = Global.DigitalData.GUIs.Monitor.Form1 + End Sub + End Class +End Namespace diff --git a/GUIs.Monitor/My Project/Application.myapp b/GUIs.Monitor/My Project/Application.myapp new file mode 100644 index 00000000..1243847f --- /dev/null +++ b/GUIs.Monitor/My Project/Application.myapp @@ -0,0 +1,11 @@ + + + true + Form1 + false + 0 + true + 0 + 0 + true + diff --git a/GUIs.Monitor/My Project/AssemblyInfo.vb b/GUIs.Monitor/My Project/AssemblyInfo.vb new file mode 100644 index 00000000..330d72a8 --- /dev/null +++ b/GUIs.Monitor/My Project/AssemblyInfo.vb @@ -0,0 +1,36 @@ +Imports System.Reflection +Imports System.Runtime.CompilerServices +Imports System.Runtime.InteropServices + +' General Information about an assembly is controlled through the following +' set of attributes. Change these attribute values to modify the information +' associated with an assembly. + + + + + + + + + +' Setting ComVisible to false makes the types in this assembly not visible +' to COM components. If you need to access a type in this assembly from +' COM, set the ComVisible attribute to true on that type. + + +' The following GUID is for the ID of the typelib if this project is exposed to COM + + +' Version information for an assembly consists of the following four values: +' +' Major Version +' Minor Version +' Build Number +' Revision +' +' You can specify all the values or you can default the Build and Revision Numbers +' by using the '*' as shown below: +' [assembly: AssemblyVersion("1.0.*")] + + diff --git a/GUIs.Monitor/My Project/Resources.Designer.vb b/GUIs.Monitor/My Project/Resources.Designer.vb new file mode 100644 index 00000000..6e2e2c9f --- /dev/null +++ b/GUIs.Monitor/My Project/Resources.Designer.vb @@ -0,0 +1,63 @@ +'------------------------------------------------------------------------------ +' +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 +' +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + +Imports System + +Namespace My.Resources + + 'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert + '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. + 'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen + 'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. + ''' + ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. + ''' + _ + Friend Module Resources + + Private resourceMan As Global.System.Resources.ResourceManager + + Private resourceCulture As Global.System.Globalization.CultureInfo + + ''' + ''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. + ''' + _ + Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager + Get + If Object.ReferenceEquals(resourceMan, Nothing) Then + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DigitalData.GUIs.Monitor.Resources", GetType(Resources).Assembly) + resourceMan = temp + End If + Return resourceMan + End Get + End Property + + ''' + ''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + ''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. + ''' + _ + Friend Property Culture() As Global.System.Globalization.CultureInfo + Get + Return resourceCulture + End Get + Set + resourceCulture = value + End Set + End Property + End Module +End Namespace diff --git a/GUIs.Monitor/My Project/Resources.resx b/GUIs.Monitor/My Project/Resources.resx new file mode 100644 index 00000000..901f10d6 --- /dev/null +++ b/GUIs.Monitor/My Project/Resources.resx @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/GUIs.Monitor/My Project/Settings.Designer.vb b/GUIs.Monitor/My Project/Settings.Designer.vb new file mode 100644 index 00000000..008b7edb --- /dev/null +++ b/GUIs.Monitor/My Project/Settings.Designer.vb @@ -0,0 +1,71 @@ +'------------------------------------------------------------------------------ +' +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 +' +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + + + + _ +Partial Friend NotInheritable Class Settings + Inherits Global.System.Configuration.ApplicationSettingsBase + + Private Shared defaultInstance As Settings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New Settings()),Settings) + +#Region "Automatische My.Settings-Speicherfunktion" +#If _MyType = "WindowsForms" Then + Private Shared addedHandler As Boolean + + Private Shared addedHandlerLockObject As New Object + + _ + Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs) + If My.Application.SaveMySettingsOnExit Then + My.Settings.Save() + End If + End Sub +#End If +#End Region + + Public Shared ReadOnly Property [Default]() As Settings + Get + +#If _MyType = "WindowsForms" Then + If Not addedHandler Then + SyncLock addedHandlerLockObject + If Not addedHandler Then + AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings + addedHandler = True + End If + End SyncLock + End If +#End If + Return defaultInstance + End Get + End Property +End Class + +Namespace My + + _ + Friend Module MySettingsProperty + + _ + Friend ReadOnly Property Settings() As Global.DigitalData.GUIs.Monitor.Settings + Get + Return Global.DigitalData.GUIs.Monitor.Settings.Default + End Get + End Property + End Module +End Namespace diff --git a/GUIs.Monitor/My Project/Settings.settings b/GUIs.Monitor/My Project/Settings.settings new file mode 100644 index 00000000..39645652 --- /dev/null +++ b/GUIs.Monitor/My Project/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + diff --git a/GUIs.Monitor/My Project/licenses.licx b/GUIs.Monitor/My Project/licenses.licx new file mode 100644 index 00000000..3f51afe8 --- /dev/null +++ b/GUIs.Monitor/My Project/licenses.licx @@ -0,0 +1 @@ +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/GUIs.Monitor/app.config b/GUIs.Monitor/app.config new file mode 100644 index 00000000..8f96d242 --- /dev/null +++ b/GUIs.Monitor/app.config @@ -0,0 +1,41 @@ + + + + +
+ + + + + + System + + + True + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SQLConfig/App.config b/SQLConfig/App.config new file mode 100644 index 00000000..cd714553 --- /dev/null +++ b/SQLConfig/App.config @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SQLConfig/My Project/Application.Designer.vb b/SQLConfig/My Project/Application.Designer.vb new file mode 100644 index 00000000..5562f4b0 --- /dev/null +++ b/SQLConfig/My Project/Application.Designer.vb @@ -0,0 +1,38 @@ +'------------------------------------------------------------------------------ +' +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 +' +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + + +Namespace My + + 'HINWEIS: Diese Datei wird automatisch generiert und darf nicht direkt bearbeitet werden. Wenn Sie Änderungen vornehmen möchten + ' oder in dieser Datei Buildfehler auftreten, wechseln Sie zum Projekt-Designer. + ' (Wechseln Sie dazu zu den Projekteigenschaften, oder doppelklicken Sie auf den Knoten "Mein Projekt" im + ' Projektmappen-Explorer). Nehmen Sie auf der Registerkarte "Anwendung" entsprechende Änderungen vor. + ' + Partial Friend Class MyApplication + + _ + Public Sub New() + MyBase.New(Global.Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows) + Me.IsSingleInstance = false + Me.EnableVisualStyles = true + Me.SaveMySettingsOnExit = true + Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses + End Sub + + _ + Protected Overrides Sub OnCreateMainForm() + Me.MainForm = Global.SQLConfig.frmSQLConfig + End Sub + End Class +End Namespace diff --git a/SQLConfig/My Project/Application.myapp b/SQLConfig/My Project/Application.myapp new file mode 100644 index 00000000..745fec77 --- /dev/null +++ b/SQLConfig/My Project/Application.myapp @@ -0,0 +1,10 @@ + + + true + frmSQLConfig + false + 0 + true + 0 + true + \ No newline at end of file diff --git a/SQLConfig/My Project/AssemblyInfo.vb b/SQLConfig/My Project/AssemblyInfo.vb new file mode 100644 index 00000000..ec79e040 --- /dev/null +++ b/SQLConfig/My Project/AssemblyInfo.vb @@ -0,0 +1,35 @@ +Imports System +Imports System.Reflection +Imports System.Runtime.InteropServices + +' Allgemeine Informationen über eine Assembly werden über die folgenden +' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, +' die einer Assembly zugeordnet sind. + +' Werte der Assemblyattribute überprüfen + + + + + + + + + + +'Die folgende GUID wird für die typelib-ID verwendet, wenn dieses Projekt für COM verfügbar gemacht wird. + + +' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: +' +' Hauptversion +' Nebenversion +' Buildnummer +' Revision +' +' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, +' indem Sie "*" wie unten gezeigt eingeben: +' + + + diff --git a/SQLConfig/My Project/Resources.Designer.vb b/SQLConfig/My Project/Resources.Designer.vb new file mode 100644 index 00000000..b23248b0 --- /dev/null +++ b/SQLConfig/My Project/Resources.Designer.vb @@ -0,0 +1,62 @@ +'------------------------------------------------------------------------------ +' +' This code was generated by a tool. +' Runtime Version:4.0.30319.42000 +' +' Changes to this file may cause incorrect behavior and will be lost if +' the code is regenerated. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + + +Namespace My.Resources + + 'This class was auto-generated by the StronglyTypedResourceBuilder + 'class via a tool like ResGen or Visual Studio. + 'To add or remove a member, edit your .ResX file then rerun ResGen + 'with the /str option, or rebuild your VS project. + ''' + ''' A strongly-typed resource class, for looking up localized strings, etc. + ''' + _ + Friend Module Resources + + Private resourceMan As Global.System.Resources.ResourceManager + + Private resourceCulture As Global.System.Globalization.CultureInfo + + ''' + ''' Returns the cached ResourceManager instance used by this class. + ''' + _ + Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager + Get + If Object.ReferenceEquals(resourceMan, Nothing) Then + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("SQLConfig.Resources", GetType(Resources).Assembly) + resourceMan = temp + End If + Return resourceMan + End Get + End Property + + ''' + ''' Overrides the current thread's CurrentUICulture property for all + ''' resource lookups using this strongly typed resource class. + ''' + _ + Friend Property Culture() As Global.System.Globalization.CultureInfo + Get + Return resourceCulture + End Get + Set(ByVal value As Global.System.Globalization.CultureInfo) + resourceCulture = value + End Set + End Property + End Module +End Namespace diff --git a/SQLConfig/My Project/Resources.resx b/SQLConfig/My Project/Resources.resx new file mode 100644 index 00000000..af7dbebb --- /dev/null +++ b/SQLConfig/My Project/Resources.resx @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SQLConfig/My Project/Settings.Designer.vb b/SQLConfig/My Project/Settings.Designer.vb new file mode 100644 index 00000000..7a0222cc --- /dev/null +++ b/SQLConfig/My Project/Settings.Designer.vb @@ -0,0 +1,73 @@ +'------------------------------------------------------------------------------ +' +' This code was generated by a tool. +' Runtime Version:4.0.30319.42000 +' +' Changes to this file may cause incorrect behavior and will be lost if +' the code is regenerated. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + + +Namespace My + + _ + Partial Friend NotInheritable Class MySettings + Inherits Global.System.Configuration.ApplicationSettingsBase + + Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings) + +#Region "My.Settings Auto-Save Functionality" +#If _MyType = "WindowsForms" Then + Private Shared addedHandler As Boolean + + Private Shared addedHandlerLockObject As New Object + + _ + Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) + If My.Application.SaveMySettingsOnExit Then + My.Settings.Save() + End If + End Sub +#End If +#End Region + + Public Shared ReadOnly Property [Default]() As MySettings + Get + +#If _MyType = "WindowsForms" Then + If Not addedHandler Then + SyncLock addedHandlerLockObject + If Not addedHandler Then + AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings + addedHandler = True + End If + End SyncLock + End If +#End If + Return defaultInstance + End Get + End Property + End Class +End Namespace + +Namespace My + + _ + Friend Module MySettingsProperty + + _ + Friend ReadOnly Property Settings() As Global.SQLConfig.My.MySettings + Get + Return Global.SQLConfig.My.MySettings.Default + End Get + End Property + End Module +End Namespace diff --git a/SQLConfig/My Project/Settings.settings b/SQLConfig/My Project/Settings.settings new file mode 100644 index 00000000..85b890b3 --- /dev/null +++ b/SQLConfig/My Project/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + diff --git a/SQLConfig/My Project/licenses.licx b/SQLConfig/My Project/licenses.licx new file mode 100644 index 00000000..d21850c7 --- /dev/null +++ b/SQLConfig/My Project/licenses.licx @@ -0,0 +1,4 @@ +DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.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.XtraLayout.LayoutControl, 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 diff --git a/SQLConfig/SQLConfig.vbproj b/SQLConfig/SQLConfig.vbproj new file mode 100644 index 00000000..d90e1443 --- /dev/null +++ b/SQLConfig/SQLConfig.vbproj @@ -0,0 +1,158 @@ + + + + + Debug + AnyCPU + {65EFB268-C0E0-40C1-8981-9F70DEE5C74A} + WinExe + SQLConfig.My.MyApplication + SQLConfig + SQLConfig + 512 + WindowsForms + v4.6.1 + true + true + + + AnyCPU + true + full + true + true + bin\Debug\ + SQLConfig.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + + + AnyCPU + pdbonly + false + true + true + bin\Release\ + SQLConfig.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + + + On + + + Binary + + + Off + + + On + + + + + + False + D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.XtraEditors.v19.2.dll + + + False + D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.XtraLayout.v19.2.dll + + + + ..\packages\NLog.4.7.5\lib\net45\NLog.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + frmSQLConfig.vb + + + Form + + + + True + Application.myapp + True + + + True + True + Resources.resx + + + True + Settings.settings + True + + + + + frmSQLConfig.vb + + + + VbMyResourcesResXFileCodeGenerator + Resources.Designer.vb + My.Resources + Designer + + + + + MyApplicationCodeGenerator + Application.Designer.vb + + + SettingsSingleFileGenerator + My + Settings.Designer.vb + + + + + + + {eaf0ea75-5fa7-485d-89c7-b2d843b03a96} + Database + + + {991d0231-4623-496d-8bd0-9ca906029cbc} + Filesystem + + + {903b2d7d-3b80-4be9-8713-7447b704e1b0} + Logging + + + + \ No newline at end of file diff --git a/SQLConfig/frmSQLConfig.Designer.vb b/SQLConfig/frmSQLConfig.Designer.vb new file mode 100644 index 00000000..a54c19ed --- /dev/null +++ b/SQLConfig/frmSQLConfig.Designer.vb @@ -0,0 +1,271 @@ + _ +Partial Class frmSQLConfig + Inherits DevExpress.XtraEditors.XtraForm + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() + Me.txtServerName = New DevExpress.XtraEditors.TextEdit() + Me.txtUserName = New DevExpress.XtraEditors.TextEdit() + Me.txtPassword = New DevExpress.XtraEditors.TextEdit() + Me.cmbDatabase = New DevExpress.XtraEditors.ComboBoxEdit() + Me.btnTestConnection = New DevExpress.XtraEditors.SimpleButton() + Me.txtConnectionString = New DevExpress.XtraEditors.TextEdit() + Me.chkWinAuth = New DevExpress.XtraEditors.CheckEdit() + Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup() + Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() + Me.EmptySpaceItem2 = New DevExpress.XtraLayout.EmptySpaceItem() + CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.LayoutControl1.SuspendLayout() + CType(Me.txtServerName.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtUserName.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtPassword.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.cmbDatabase.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtConnectionString.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.chkWinAuth.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.EmptySpaceItem2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'LayoutControl1 + ' + Me.LayoutControl1.Controls.Add(Me.txtServerName) + Me.LayoutControl1.Controls.Add(Me.txtUserName) + Me.LayoutControl1.Controls.Add(Me.txtPassword) + Me.LayoutControl1.Controls.Add(Me.cmbDatabase) + Me.LayoutControl1.Controls.Add(Me.btnTestConnection) + Me.LayoutControl1.Controls.Add(Me.txtConnectionString) + Me.LayoutControl1.Controls.Add(Me.chkWinAuth) + Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.LayoutControl1.Location = New System.Drawing.Point(0, 0) + Me.LayoutControl1.Name = "LayoutControl1" + Me.LayoutControl1.Root = Me.LayoutControlGroup1 + Me.LayoutControl1.Size = New System.Drawing.Size(602, 221) + Me.LayoutControl1.TabIndex = 0 + Me.LayoutControl1.Text = "LayoutControl1" + ' + 'txtServerName + ' + Me.txtServerName.Location = New System.Drawing.Point(148, 15) + Me.txtServerName.Name = "txtServerName" + Me.txtServerName.Size = New System.Drawing.Size(439, 20) + Me.txtServerName.StyleController = Me.LayoutControl1 + Me.txtServerName.TabIndex = 4 + ' + 'txtUserName + ' + Me.txtUserName.Location = New System.Drawing.Point(148, 45) + Me.txtUserName.Name = "txtUserName" + Me.txtUserName.Size = New System.Drawing.Size(148, 20) + Me.txtUserName.StyleController = Me.LayoutControl1 + Me.txtUserName.TabIndex = 5 + ' + 'txtPassword + ' + Me.txtPassword.Location = New System.Drawing.Point(439, 45) + Me.txtPassword.Name = "txtPassword" + Me.txtPassword.Size = New System.Drawing.Size(148, 20) + Me.txtPassword.StyleController = Me.LayoutControl1 + Me.txtPassword.TabIndex = 6 + ' + 'cmbDatabase + ' + Me.cmbDatabase.Location = New System.Drawing.Point(148, 75) + Me.cmbDatabase.Name = "cmbDatabase" + Me.cmbDatabase.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.cmbDatabase.Size = New System.Drawing.Size(439, 20) + Me.cmbDatabase.StyleController = Me.LayoutControl1 + Me.cmbDatabase.TabIndex = 7 + ' + 'btnTestConnection + ' + Me.btnTestConnection.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) + Me.btnTestConnection.Location = New System.Drawing.Point(303, 166) + Me.btnTestConnection.Name = "btnTestConnection" + Me.btnTestConnection.Size = New System.Drawing.Size(287, 22) + Me.btnTestConnection.StyleController = Me.LayoutControl1 + Me.btnTestConnection.TabIndex = 8 + Me.btnTestConnection.Text = "Verbindung zur Datenbank herstellen" + ' + 'txtConnectionString + ' + Me.txtConnectionString.Location = New System.Drawing.Point(148, 139) + Me.txtConnectionString.Name = "txtConnectionString" + Me.txtConnectionString.Properties.ReadOnly = True + Me.txtConnectionString.Size = New System.Drawing.Size(439, 20) + Me.txtConnectionString.StyleController = Me.LayoutControl1 + Me.txtConnectionString.TabIndex = 9 + ' + 'chkWinAuth + ' + Me.chkWinAuth.Location = New System.Drawing.Point(17, 107) + Me.chkWinAuth.Name = "chkWinAuth" + Me.chkWinAuth.Properties.Caption = "Windows Authentifizierung" + Me.chkWinAuth.Size = New System.Drawing.Size(568, 20) + Me.chkWinAuth.StyleController = Me.LayoutControl1 + Me.chkWinAuth.TabIndex = 10 + ' + 'LayoutControlGroup1 + ' + Me.LayoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] + Me.LayoutControlGroup1.GroupBordersVisible = False + Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.LayoutControlItem4, Me.LayoutControlItem3, Me.LayoutControlItem7, Me.LayoutControlItem6, Me.LayoutControlItem5, Me.EmptySpaceItem2}) + Me.LayoutControlGroup1.Name = "LayoutControlGroup1" + Me.LayoutControlGroup1.Size = New System.Drawing.Size(602, 221) + Me.LayoutControlGroup1.TextVisible = False + ' + 'LayoutControlItem1 + ' + Me.LayoutControlItem1.Control = Me.txtServerName + Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlItem1.Name = "LayoutControlItem1" + Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem1.Size = New System.Drawing.Size(582, 30) + Me.LayoutControlItem1.Text = "Server Name:" + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(130, 13) + ' + 'LayoutControlItem2 + ' + Me.LayoutControlItem2.Control = Me.txtUserName + Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 30) + Me.LayoutControlItem2.Name = "LayoutControlItem2" + Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem2.Size = New System.Drawing.Size(291, 30) + Me.LayoutControlItem2.Text = "Benutzername:" + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(130, 13) + ' + 'LayoutControlItem4 + ' + Me.LayoutControlItem4.Control = Me.cmbDatabase + Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 60) + Me.LayoutControlItem4.Name = "LayoutControlItem4" + Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem4.Size = New System.Drawing.Size(582, 30) + Me.LayoutControlItem4.Text = "Datenbank:" + Me.LayoutControlItem4.TextSize = New System.Drawing.Size(130, 13) + ' + 'LayoutControlItem3 + ' + Me.LayoutControlItem3.Control = Me.txtPassword + Me.LayoutControlItem3.Location = New System.Drawing.Point(291, 30) + Me.LayoutControlItem3.Name = "LayoutControlItem3" + Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem3.Size = New System.Drawing.Size(291, 30) + Me.LayoutControlItem3.Text = "Passwort:" + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(130, 13) + ' + 'LayoutControlItem7 + ' + Me.LayoutControlItem7.Control = Me.chkWinAuth + Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 90) + Me.LayoutControlItem7.Name = "LayoutControlItem7" + Me.LayoutControlItem7.Size = New System.Drawing.Size(582, 34) + Me.LayoutControlItem7.Spacing = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem7.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem7.TextVisible = False + ' + 'LayoutControlItem6 + ' + Me.LayoutControlItem6.Control = Me.txtConnectionString + Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 124) + Me.LayoutControlItem6.Name = "LayoutControlItem6" + Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem6.Size = New System.Drawing.Size(582, 30) + Me.LayoutControlItem6.Text = "Aktueller Connectionstring:" + Me.LayoutControlItem6.TextSize = New System.Drawing.Size(130, 13) + ' + 'LayoutControlItem5 + ' + Me.LayoutControlItem5.Control = Me.btnTestConnection + Me.LayoutControlItem5.Location = New System.Drawing.Point(291, 154) + Me.LayoutControlItem5.Name = "LayoutControlItem5" + Me.LayoutControlItem5.Size = New System.Drawing.Size(291, 47) + Me.LayoutControlItem5.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem5.TextVisible = False + ' + 'EmptySpaceItem2 + ' + Me.EmptySpaceItem2.AllowHotTrack = False + Me.EmptySpaceItem2.Location = New System.Drawing.Point(0, 154) + Me.EmptySpaceItem2.Name = "EmptySpaceItem2" + Me.EmptySpaceItem2.Size = New System.Drawing.Size(291, 47) + Me.EmptySpaceItem2.TextSize = New System.Drawing.Size(0, 0) + ' + 'frmConfigDatabase + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(602, 221) + Me.Controls.Add(Me.LayoutControl1) + Me.Name = "frmConfigDatabase" + Me.Text = "Datenbank Verbindung" + CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.LayoutControl1.ResumeLayout(False) + CType(Me.txtServerName.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtUserName.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtPassword.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.cmbDatabase.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtConnectionString.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.chkWinAuth.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.EmptySpaceItem2, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl + Friend WithEvents LayoutControlGroup1 As DevExpress.XtraLayout.LayoutControlGroup + Friend WithEvents txtServerName As DevExpress.XtraEditors.TextEdit + Friend WithEvents txtUserName As DevExpress.XtraEditors.TextEdit + Friend WithEvents txtPassword As DevExpress.XtraEditors.TextEdit + Friend WithEvents cmbDatabase As DevExpress.XtraEditors.ComboBoxEdit + Friend WithEvents btnTestConnection As DevExpress.XtraEditors.SimpleButton + Friend WithEvents txtConnectionString As DevExpress.XtraEditors.TextEdit + Friend WithEvents chkWinAuth As DevExpress.XtraEditors.CheckEdit + Friend WithEvents LayoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem7 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem6 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem5 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents EmptySpaceItem2 As DevExpress.XtraLayout.EmptySpaceItem +End Class diff --git a/SQLConfig/frmSQLConfig.resx b/SQLConfig/frmSQLConfig.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/SQLConfig/frmSQLConfig.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SQLConfig/frmSQLConfig.vb b/SQLConfig/frmSQLConfig.vb new file mode 100644 index 00000000..05b463e5 --- /dev/null +++ b/SQLConfig/frmSQLConfig.vb @@ -0,0 +1,142 @@ +Imports System.Data.SqlClient +Imports DigitalData.Modules.Database +Imports DigitalData.Modules.Filesystem +Imports DigitalData.Modules.Logging + +Public Class frmSQLConfig + Private Const STRING_CONNECTION_SUCCESSFUL = "Die Verbindung wurde erfolgreich aufgebaut!" & vbNewLine & "Möchten Sie diese Verbindung nun in der Anwendung speichern?" + + Private ReadOnly Logger As Logger + Private ReadOnly LogConfig As LogConfig + + Public Property ConnectionString As String + + Public Sub New() + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + End Sub + + Public Sub New(LogConfig As LogConfig) + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + Me.LogConfig = LogConfig + Logger = LogConfig.GetLogger() + End Sub + + Private Sub frmSQLConfig_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Dim oConnectionString = ConnectionString + + If Not oConnectionString = String.Empty Then + Dim oBuilder As SqlConnectionStringBuilder + Try + oBuilder = New SqlConnectionStringBuilder(ConnectionString) + Catch ex As Exception + oBuilder = Nothing + End Try + + If oBuilder Is Nothing Then + MsgBox("Connection String ist ungültig!", MsgBoxStyle.Critical, Text) + Exit Sub + End If + + If oConnectionString.Contains("Trusted") Then + chkWinAuth.Checked = True + txtConnectionString.Text = oConnectionString + Else + chkWinAuth.Checked = False + txtConnectionString.Text = oConnectionString.Replace(oBuilder.Password, "XXXXXX") + txtUserName.Text = oBuilder.UserID + End If + + txtServerName.Text = oBuilder.DataSource + cmbDatabase.Text = oBuilder.InitialCatalog + End If + End Sub + + Private Sub chkWinAuth_CheckedChanged(sender As Object, e As EventArgs) Handles chkWinAuth.CheckedChanged + txtPassword.Enabled = Not chkWinAuth.Checked + txtUserName.Enabled = Not chkWinAuth.Checked + End Sub + + Private Sub cmbDatabase_Click(sender As Object, e As EventArgs) Handles cmbDatabase.Click + Cursor = Cursors.WaitCursor + + Dim oConnectionString As String = GetConnectionString(False) + Dim oDatabase As New MSSQLServer(LogConfig, oConnectionString) + + If oDatabase.DBInitialized = False Then + MsgBox("Verbindung fehlgeschlagen!", MsgBoxStyle.Critical, Text) + Exit Sub + End If + + Try + Using oConnection = New SqlClient.SqlConnection(oConnectionString) + oConnection.Open() + Using oCommand As New SqlClient.SqlCommand("sp_databases", oConnection) + Using oReader As SqlClient.SqlDataReader = oCommand.ExecuteReader + If oReader.HasRows Then + cmbDatabase.Properties.Items.Clear() + + Do While oReader.Read + cmbDatabase.Properties.Items.Add(oReader("Database_Name")) + Loop + cmbDatabase.ShowPopup() + Else + MsgBox("The standard-databases could not be retrieved. The default database will be set!" & vbNewLine & "Check rights in sql-server for user: " & Me.txtUserName.Text, MsgBoxStyle.Exclamation) + End If + End Using + End Using + End Using + + Catch ex As Exception + Logger.Error(ex) + Finally + Cursor = Cursors.Default + End Try + End Sub + + Private Function GetConnectionString(WithDatabase As Boolean) As String + Dim oConnectionString As String + + If chkWinAuth.Checked Then + oConnectionString = $"Data Source={txtServerName.Text};Trusted_Connection=True;" + Else + oConnectionString = $"Server={txtServerName.Text};User Id={txtUserName.Text};Password={txtPassword.Text};" + End If + + If WithDatabase Then + oConnectionString &= $"Database={cmbDatabase.Text};" + End If + + Return oConnectionString + End Function + + Private Sub btnTestConnection_Click(sender As Object, e As EventArgs) Handles btnTestConnection.Click + Try + Dim oConnectionString = GetConnectionString(True) + + Using oConnection As New SqlConnection(oConnectionString) + oConnection.Open() + oConnection.Close() + End Using + + Dim oResult = MessageBox.Show(STRING_CONNECTION_SUCCESSFUL, Text, MessageBoxButtons.YesNo, MessageBoxIcon.Question) + + If oResult = DialogResult.Yes Then + Dim oCrypt As New EncryptionLegacy("!35452didalog=") + Dim oEncryptedPassword = oCrypt.EncryptData(txtPassword.Text) + Dim oEncryptedConnectionString = $"Server={txtServerName.Text};Database={cmbDatabase.Text};User Id={txtUserName.Text};Password={oEncryptedPassword};" + + ConnectionString = oEncryptedConnectionString + Close() + End If + Catch ex As Exception + Logger.Error(ex) + MsgBox("Error while connecting to Database", MsgBoxStyle.Critical, Text) + End Try + End Sub +End Class \ No newline at end of file diff --git a/SQLConfig/packages.config b/SQLConfig/packages.config new file mode 100644 index 00000000..6f6bc401 --- /dev/null +++ b/SQLConfig/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file From ac4fabe8c202229fbbf9c5f76ca9f8e13dfb8dcd Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 4 May 2021 14:54:15 +0200 Subject: [PATCH 69/82] ZooFLow: Use SQLConfig form --- GUIs.ZooFlow/ClassInit.vb | 13 +- GUIs.ZooFlow/My Project/Resources.Designer.vb | 10 + GUIs.ZooFlow/My Project/Resources.resx | 117 +++++------ GUIs.ZooFlow/Resources/actions_check5.svg | 15 ++ GUIs.ZooFlow/ZooFlow.vbproj | 7 + GUIs.ZooFlow/frmConfigDatabase.Designer.vb | 188 +++++++++--------- GUIs.ZooFlow/frmConfigDatabase.vb | 16 +- 7 files changed, 209 insertions(+), 157 deletions(-) create mode 100644 GUIs.ZooFlow/Resources/actions_check5.svg diff --git a/GUIs.ZooFlow/ClassInit.vb b/GUIs.ZooFlow/ClassInit.vb index ac5584c3..314dd871 100644 --- a/GUIs.ZooFlow/ClassInit.vb +++ b/GUIs.ZooFlow/ClassInit.vb @@ -4,6 +4,7 @@ Imports DigitalData.Modules.Database Imports DigitalData.Modules.Filesystem Imports DigitalData.Modules.Language.Utils Imports DigitalData.Modules.Logging +Imports DigitalData.Controls.SQLConfig Imports DigitalData.GUIs.ZooFlow.ClassInitLoader Imports DigitalData.GUIs.ZooFlow.ClassConstants Imports System.Threading @@ -71,9 +72,17 @@ Public Class ClassInit Private Function SetupDatabase() As Boolean If My.SystemConfig.ConnectionString = String.Empty Then - Dim oResult = frmConfigDatabase.ShowDialog() + Dim oConnectionString = My.SystemConfig.ConnectionString - If oResult = DialogResult.Cancel Then + Dim ofrmSQLConfig As New frmSQLConfig(My.LogConfig) With {.ConnectionString = oConnectionString} + + Dim oResult = ofrmSQLConfig.ShowDialog() + + If oResult = DialogResult.OK Then + My.SystemConfig.ConnectionString = ofrmSQLConfig.ConnectionString + + Return True + Else MsgBox("Es wurde keine Datenbank hinterlegt. Die Anwendung wird beendet.") Return False End If diff --git a/GUIs.ZooFlow/My Project/Resources.Designer.vb b/GUIs.ZooFlow/My Project/Resources.Designer.vb index becd271f..c8e7f2b9 100644 --- a/GUIs.ZooFlow/My Project/Resources.Designer.vb +++ b/GUIs.ZooFlow/My Project/Resources.Designer.vb @@ -360,6 +360,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property actions_check4() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("actions_check4", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' diff --git a/GUIs.ZooFlow/My Project/Resources.resx b/GUIs.ZooFlow/My Project/Resources.resx index d0a84b98..2f34d0aa 100644 --- a/GUIs.ZooFlow/My Project/Resources.resx +++ b/GUIs.ZooFlow/My Project/Resources.resx @@ -136,14 +136,17 @@ ..\Resources\doublenext2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_addcircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\doublenext1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_deletecircled6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\definednameuseinformula3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\editquery.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\Checked-outforEdit_Color_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -154,6 +157,9 @@ ..\Resources\definednameuseinformula.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\about1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -163,11 +169,11 @@ ..\Resources\about2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\save4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\StatusAnnotations_Stop_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\renamedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_addcircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\DD_Icons_ICO_PMANAGER_128px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -178,9 +184,6 @@ ..\Resources\actions_window.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\pagesetup.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\ZOO_FLOW_ sysicon_256.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -205,9 +208,6 @@ ..\Resources\actions_check3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_check2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\actions_addcircled3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -226,21 +226,21 @@ ..\Resources\save1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\del.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\bell_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\save2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\doublenext.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\del1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\CW_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Checked-outforEdit_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -250,18 +250,21 @@ ..\Resources\2_LUPE_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\actions_check1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\1_LOGO_ZOO_FLOW_DROP3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\about.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\actions_addcircled5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\highimportance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\save3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\save7.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -283,8 +286,8 @@ ..\Resources\DD_Icons_ICO_PMANAGER_256px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\doublenext1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\ZooFlow-25.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -292,11 +295,8 @@ ..\Resources\insertsheet.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\actions_edit.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_addcircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_edit2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -313,32 +313,35 @@ ..\Resources\about3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\doublenext.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\pagesetup.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_add1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\3_PERSON_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\del3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\bo_appearance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\actions_deletecircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\4_GLOBIX_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\del4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_addcircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\bo_document.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\about.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\save4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\pagesetup1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -358,23 +361,23 @@ ..\Resources\1_LOGO_ZOO_FLOW1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\StatusAnnotations_Stop_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_edit.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_deletecircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\editquery.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_check1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\3_PERSON_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\CW_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\actions_edit1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\bo_appearance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_check2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_addcircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -382,11 +385,11 @@ ..\Resources\crossdatasourcefiltering.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\save3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\4_GLOBIX_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_deletecircled6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\Flow.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -394,8 +397,8 @@ ..\Resources\3_PERSON_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\renamedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\2_LUPE_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -412,13 +415,13 @@ ..\Resources\1_LOGO_ZOO_FLOW_DROP2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\del.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\GLOBIX_short.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\definednameuseinformula3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_check5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/actions_check5.svg b/GUIs.ZooFlow/Resources/actions_check5.svg new file mode 100644 index 00000000..35c68028 --- /dev/null +++ b/GUIs.ZooFlow/Resources/actions_check5.svg @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 86862a80..defdf3fe 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -512,6 +512,10 @@ {81cac44f-3711-4c8f-ae98-e02a7448782a} ZooFlow + + {65efb268-c0e0-40c1-8981-9f70dee5c74a} + SQLConfig + {5efaef9b-90b9-4f05-9f70-f79ad77fff86} Windows @@ -806,6 +810,9 @@ + + + + - + - - - + + + + - - + + - - + + - - - + + + + - + - + @@ -109,9 +112,16 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\charttype_line.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\gettingstarted.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + \ No newline at end of file diff --git a/GUIs.Monitor/My Project/licenses.licx b/GUIs.Monitor/My Project/licenses.licx index 3f51afe8..fe84aa59 100644 --- a/GUIs.Monitor/My Project/licenses.licx +++ b/GUIs.Monitor/My Project/licenses.licx @@ -1 +1,6 @@ +DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.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.XtraLayout.LayoutControl, DevExpress.XtraLayout.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.TextEdit, DevExpress.XtraEditors.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 diff --git a/GUIs.Monitor/Resources/charttype_line.svg b/GUIs.Monitor/Resources/charttype_line.svg new file mode 100644 index 00000000..8e1af17b --- /dev/null +++ b/GUIs.Monitor/Resources/charttype_line.svg @@ -0,0 +1,20 @@ + + + + + + + + + \ No newline at end of file diff --git a/GUIs.Monitor/Resources/gettingstarted.svg b/GUIs.Monitor/Resources/gettingstarted.svg new file mode 100644 index 00000000..b9b88d44 --- /dev/null +++ b/GUIs.Monitor/Resources/gettingstarted.svg @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.Monitor/app.config b/GUIs.Monitor/app.config index 8f96d242..48d7e205 100644 --- a/GUIs.Monitor/app.config +++ b/GUIs.Monitor/app.config @@ -1,8 +1,8 @@ - + -
+
@@ -16,26 +16,26 @@ - + - + - + - + - \ No newline at end of file + diff --git a/GUIs.Monitor/frmStart.Designer.vb b/GUIs.Monitor/frmStart.Designer.vb new file mode 100644 index 00000000..90a87087 --- /dev/null +++ b/GUIs.Monitor/frmStart.Designer.vb @@ -0,0 +1,327 @@ +Imports DigitalData.GUIs.Common.Base + + +Partial Class frmStart + 'Inherits DevExpress.XtraBars.Ribbon.RibbonForm + Inherits BaseRibbonForm + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() + Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() + Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.DockManager1 = New DevExpress.XtraBars.Docking.DockManager(Me.components) + Me.DockPanel1 = New DevExpress.XtraBars.Docking.DockPanel() + Me.DockPanel1_Container = New DevExpress.XtraBars.Docking.ControlContainer() + Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() + Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit() + Me.ComboBoxEdit1 = New DevExpress.XtraEditors.ComboBoxEdit() + Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() + Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() + Me.TextEdit2 = New DevExpress.XtraEditors.ComboBoxEdit() + Me.DockPanel2 = New DevExpress.XtraBars.Docking.DockPanel() + Me.DockPanel2_Container = New DevExpress.XtraBars.Docking.ControlContainer() + Me.TreeList1 = New DevExpress.XtraTreeList.TreeList() + Me.DockPanel3 = New DevExpress.XtraBars.Docking.DockPanel() + Me.DockPanel3_Container = New DevExpress.XtraBars.Docking.ControlContainer() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.DockManager1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.DockPanel1.SuspendLayout() + Me.DockPanel1_Container.SuspendLayout() + CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.LayoutControl1.SuspendLayout() + CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + Me.DockPanel2.SuspendLayout() + CType(Me.TreeList1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.DockPanel3.SuspendLayout() + Me.SuspendLayout() + ' + 'RibbonControl1 + ' + Me.RibbonControl1.ExpandCollapseItem.Id = 0 + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1}) + Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) + Me.RibbonControl1.MaxItemId = 2 + Me.RibbonControl1.Name = "RibbonControl1" + Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) + Me.RibbonControl1.Size = New System.Drawing.Size(1085, 159) + Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 + ' + 'BarButtonItem1 + ' + Me.BarButtonItem1.Caption = "Suchen" + Me.BarButtonItem1.Id = 1 + Me.BarButtonItem1.ImageOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.gettingstarted + Me.BarButtonItem1.Name = "BarButtonItem1" + ' + 'RibbonPage1 + ' + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) + Me.RibbonPage1.Name = "RibbonPage1" + Me.RibbonPage1.Text = "RibbonPage1" + ' + 'RibbonPageGroup1 + ' + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup1.Name = "RibbonPageGroup1" + Me.RibbonPageGroup1.Text = "RibbonPageGroup1" + ' + 'RibbonStatusBar1 + ' + 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(1085, 22) + ' + 'RibbonPage2 + ' + Me.RibbonPage2.Name = "RibbonPage2" + Me.RibbonPage2.Text = "RibbonPage2" + ' + 'DockManager1 + ' + Me.DockManager1.Form = Me + Me.DockManager1.HiddenPanels.AddRange(New DevExpress.XtraBars.Docking.DockPanel() {Me.DockPanel1}) + Me.DockManager1.RootPanels.AddRange(New DevExpress.XtraBars.Docking.DockPanel() {Me.DockPanel2, Me.DockPanel3}) + Me.DockManager1.TopZIndexControls.AddRange(New String() {"DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.StatusBar", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl", "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl"}) + ' + 'DockPanel1 + ' + Me.DockPanel1.Controls.Add(Me.DockPanel1_Container) + Me.DockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left + Me.DockPanel1.ID = New System.Guid("52706dba-4c71-4145-b8a3-5f5423d32fce") + Me.DockPanel1.Location = New System.Drawing.Point(0, 159) + Me.DockPanel1.Name = "DockPanel1" + Me.DockPanel1.OriginalSize = New System.Drawing.Size(200, 200) + Me.DockPanel1.SavedDock = DevExpress.XtraBars.Docking.DockingStyle.Left + Me.DockPanel1.SavedIndex = 0 + Me.DockPanel1.Size = New System.Drawing.Size(200, 495) + Me.DockPanel1.Text = "Suche" + Me.DockPanel1.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden + ' + 'DockPanel1_Container + ' + Me.DockPanel1_Container.Controls.Add(Me.LayoutControl1) + 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, 446) + Me.DockPanel1_Container.TabIndex = 0 + ' + 'LayoutControl1 + ' + Me.LayoutControl1.Controls.Add(Me.TextEdit1) + Me.LayoutControl1.Controls.Add(Me.ComboBoxEdit1) + Me.LayoutControl1.Controls.Add(Me.TextEdit2) + Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.LayoutControl1.Location = New System.Drawing.Point(0, 0) + Me.LayoutControl1.Name = "LayoutControl1" + Me.LayoutControl1.Root = Me.Root + Me.LayoutControl1.Size = New System.Drawing.Size(193, 446) + Me.LayoutControl1.TabIndex = 0 + Me.LayoutControl1.Text = "LayoutControl1" + ' + 'TextEdit1 + ' + Me.TextEdit1.Location = New System.Drawing.Point(15, 123) + Me.TextEdit1.MenuManager = Me.RibbonControl1 + Me.TextEdit1.Name = "TextEdit1" + Me.TextEdit1.Size = New System.Drawing.Size(163, 20) + Me.TextEdit1.StyleController = Me.LayoutControl1 + Me.TextEdit1.TabIndex = 4 + ' + 'ComboBoxEdit1 + ' + Me.ComboBoxEdit1.Location = New System.Drawing.Point(15, 31) + Me.ComboBoxEdit1.MenuManager = Me.RibbonControl1 + Me.ComboBoxEdit1.Name = "ComboBoxEdit1" + Me.ComboBoxEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.ComboBoxEdit1.Size = New System.Drawing.Size(163, 20) + Me.ComboBoxEdit1.StyleController = Me.LayoutControl1 + Me.ComboBoxEdit1.TabIndex = 5 + ' + 'Root + ' + Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] + Me.Root.GroupBordersVisible = False + Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.LayoutControlItem3}) + Me.Root.Name = "Root" + Me.Root.Size = New System.Drawing.Size(193, 446) + Me.Root.TextVisible = False + ' + 'LayoutControlItem1 + ' + Me.LayoutControlItem1.Control = Me.TextEdit1 + Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 92) + Me.LayoutControlItem1.Name = "LayoutControlItem1" + Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem1.Size = New System.Drawing.Size(173, 334) + Me.LayoutControlItem1.Text = "Suchwert" + Me.LayoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(63, 13) + ' + 'LayoutControlItem2 + ' + Me.LayoutControlItem2.Control = Me.ComboBoxEdit1 + Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlItem2.Name = "LayoutControlItem2" + Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem2.Size = New System.Drawing.Size(173, 46) + Me.LayoutControlItem2.Text = "Attribut" + Me.LayoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(63, 13) + ' + 'LayoutControlItem3 + ' + Me.LayoutControlItem3.Control = Me.TextEdit2 + Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 46) + Me.LayoutControlItem3.Name = "LayoutControlItem3" + Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem3.Size = New System.Drawing.Size(173, 46) + Me.LayoutControlItem3.Text = "Auswertung" + Me.LayoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(63, 13) + ' + 'TextEdit2 + ' + Me.TextEdit2.Location = New System.Drawing.Point(15, 77) + Me.TextEdit2.MenuManager = Me.RibbonControl1 + Me.TextEdit2.Name = "TextEdit2" + Me.TextEdit2.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.TextEdit2.Size = New System.Drawing.Size(163, 20) + Me.TextEdit2.StyleController = Me.LayoutControl1 + Me.TextEdit2.TabIndex = 6 + ' + 'DockPanel2 + ' + Me.DockPanel2.Controls.Add(Me.DockPanel2_Container) + Me.DockPanel2.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right + Me.DockPanel2.ID = New System.Guid("157c74a2-d255-4e6b-b789-bde43010b2af") + Me.DockPanel2.Location = New System.Drawing.Point(885, 159) + Me.DockPanel2.Name = "DockPanel2" + Me.DockPanel2.OriginalSize = New System.Drawing.Size(200, 200) + Me.DockPanel2.Size = New System.Drawing.Size(200, 495) + Me.DockPanel2.Text = "Details" + ' + 'DockPanel2_Container + ' + Me.DockPanel2_Container.Location = New System.Drawing.Point(4, 46) + Me.DockPanel2_Container.Name = "DockPanel2_Container" + Me.DockPanel2_Container.Size = New System.Drawing.Size(193, 446) + Me.DockPanel2_Container.TabIndex = 0 + ' + 'TreeList1 + ' + Me.TreeList1.Dock = System.Windows.Forms.DockStyle.Fill + Me.TreeList1.Location = New System.Drawing.Point(200, 159) + Me.TreeList1.MenuManager = Me.RibbonControl1 + Me.TreeList1.Name = "TreeList1" + Me.TreeList1.Size = New System.Drawing.Size(685, 495) + Me.TreeList1.TabIndex = 4 + ' + 'DockPanel3 + ' + Me.DockPanel3.Controls.Add(Me.DockPanel3_Container) + Me.DockPanel3.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left + Me.DockPanel3.ID = New System.Guid("d2ef8b04-1b9f-49ee-8a72-31210e059dbe") + Me.DockPanel3.Location = New System.Drawing.Point(0, 159) + Me.DockPanel3.Name = "DockPanel3" + Me.DockPanel3.OriginalSize = New System.Drawing.Size(200, 200) + Me.DockPanel3.Size = New System.Drawing.Size(200, 495) + Me.DockPanel3.Text = "DockPanel3" + ' + 'DockPanel3_Container + ' + Me.DockPanel3_Container.Location = New System.Drawing.Point(3, 46) + Me.DockPanel3_Container.Name = "DockPanel3_Container" + Me.DockPanel3_Container.Size = New System.Drawing.Size(193, 446) + Me.DockPanel3_Container.TabIndex = 0 + ' + 'frmStart + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(1085, 676) + Me.Controls.Add(Me.TreeList1) + Me.Controls.Add(Me.DockPanel3) + Me.Controls.Add(Me.DockPanel2) + Me.Controls.Add(Me.RibbonStatusBar1) + Me.Controls.Add(Me.RibbonControl1) + Me.IconOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.charttype_line + Me.Name = "frmStart" + Me.Ribbon = Me.RibbonControl1 + Me.StatusBar = Me.RibbonStatusBar1 + Me.Text = "Monitor" + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.DockManager1, System.ComponentModel.ISupportInitialize).EndInit() + Me.DockPanel1.ResumeLayout(False) + Me.DockPanel1_Container.ResumeLayout(False) + CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.LayoutControl1.ResumeLayout(False) + CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() + Me.DockPanel2.ResumeLayout(False) + CType(Me.TreeList1, System.ComponentModel.ISupportInitialize).EndInit() + Me.DockPanel3.ResumeLayout(False) + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl + Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar + Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents DockManager1 As DevExpress.XtraBars.Docking.DockManager + Friend WithEvents DockPanel1 As DevExpress.XtraBars.Docking.DockPanel + Friend WithEvents DockPanel1_Container As DevExpress.XtraBars.Docking.ControlContainer + Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl + Friend WithEvents TextEdit1 As DevExpress.XtraEditors.TextEdit + Friend WithEvents ComboBoxEdit1 As DevExpress.XtraEditors.ComboBoxEdit + Friend WithEvents Root As DevExpress.XtraLayout.LayoutControlGroup + Friend WithEvents LayoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents TextEdit2 As DevExpress.XtraEditors.ComboBoxEdit + Friend WithEvents DockPanel2 As DevExpress.XtraBars.Docking.DockPanel + Friend WithEvents DockPanel2_Container As DevExpress.XtraBars.Docking.ControlContainer + Friend WithEvents TreeList1 As DevExpress.XtraTreeList.TreeList + Friend WithEvents DockPanel3 As DevExpress.XtraBars.Docking.DockPanel + Friend WithEvents DockPanel3_Container As DevExpress.XtraBars.Docking.ControlContainer +End Class diff --git a/GUIs.Monitor/Form1.resx b/GUIs.Monitor/frmStart.resx similarity index 96% rename from GUIs.Monitor/Form1.resx rename to GUIs.Monitor/frmStart.resx index 1af7de15..d361575c 100644 --- a/GUIs.Monitor/Form1.resx +++ b/GUIs.Monitor/frmStart.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/GUIs.Monitor/frmStart.vb b/GUIs.Monitor/frmStart.vb new file mode 100644 index 00000000..042e7fb5 --- /dev/null +++ b/GUIs.Monitor/frmStart.vb @@ -0,0 +1,33 @@ +Imports DigitalData.Controls.SQLConfig +Imports DigitalData.Modules.Config +Imports DigitalData.Modules.Database +Imports DigitalData.Modules.Logging + +Public Class frmStart + Public Property LogConfig As LogConfig + Public Property ConfigManager As ConfigManager(Of Config) + Public Property Database As MSSQLServer + + Private Sub frmStart_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Try + LogConfig = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing, "Digital Data", "Monitor") + ConfigManager = New ConfigManager(Of Config)(LogConfig, Application.UserAppDataPath) + + If ConfigManager.Config.ConnectionString = String.Empty Then + Dim oSQLConfig As New frmSQLConfig(LogConfig) + If oSQLConfig.ShowDialog() = DialogResult.OK Then + ConfigManager.Config.ConnectionString = oSQLConfig.ConnectionString + ConfigManager.Save() + Else + ShowErrorMessage("No Database configured. Application will close!") + Application.Exit() + + End If + End If + + Database = New MSSQLServer(LogConfig, ConfigManager.Config.ConnectionString) + Catch ex As Exception + ShowErrorMessage(ex) + End Try + End Sub +End Class \ No newline at end of file diff --git a/GUIs.Monitor/packages.config b/GUIs.Monitor/packages.config new file mode 100644 index 00000000..abeaf568 --- /dev/null +++ b/GUIs.Monitor/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file From f65f838543307cc0f772baee01ff245533897bd6 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 4 May 2021 16:31:42 +0200 Subject: [PATCH 73/82] SQLEditor: Add Nlog --- Controls.SQLEditor/App.config | 10 +++++++++- Controls.SQLEditor/SQLEditor.vbproj | 7 +++++++ Controls.SQLEditor/packages.config | 4 ++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 Controls.SQLEditor/packages.config diff --git a/Controls.SQLEditor/App.config b/Controls.SQLEditor/App.config index 5534e287..cd714553 100644 --- a/Controls.SQLEditor/App.config +++ b/Controls.SQLEditor/App.config @@ -1,6 +1,14 @@ - + + + + + + + + + \ No newline at end of file diff --git a/Controls.SQLEditor/SQLEditor.vbproj b/Controls.SQLEditor/SQLEditor.vbproj index a211f48b..46ec409a 100644 --- a/Controls.SQLEditor/SQLEditor.vbproj +++ b/Controls.SQLEditor/SQLEditor.vbproj @@ -59,6 +59,10 @@ + + + ..\packages\NLog.4.7.5\lib\net45\NLog.dll + @@ -66,9 +70,11 @@ + + @@ -139,6 +145,7 @@ + diff --git a/Controls.SQLEditor/packages.config b/Controls.SQLEditor/packages.config new file mode 100644 index 00000000..6f6bc401 --- /dev/null +++ b/Controls.SQLEditor/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file From 3f15f182269535f658fa0bd3aebeee360581d9d5 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 4 May 2021 16:31:55 +0200 Subject: [PATCH 74/82] SQLConfig: Add Default value for connection string --- SQLConfig/frmSQLConfig.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SQLConfig/frmSQLConfig.vb b/SQLConfig/frmSQLConfig.vb index 706b34b4..5c393248 100644 --- a/SQLConfig/frmSQLConfig.vb +++ b/SQLConfig/frmSQLConfig.vb @@ -10,7 +10,7 @@ Public Class frmSQLConfig Private ReadOnly Logger As Logger Private ReadOnly LogConfig As LogConfig - Public Property ConnectionString As String + Public Property ConnectionString As String = String.Empty Public Sub New() ' Dieser Aufruf ist für den Designer erforderlich. From c6726c4f3e6fc18116d1320207ad427478d0b64d Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 5 May 2021 15:01:41 +0200 Subject: [PATCH 75/82] Database: Add timeout option to all functions --- Modules.Database/MSSQLServer.vb | 40 ++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/Modules.Database/MSSQLServer.vb b/Modules.Database/MSSQLServer.vb index 93bf5a68..3e9f5407 100644 --- a/Modules.Database/MSSQLServer.vb +++ b/Modules.Database/MSSQLServer.vb @@ -231,19 +231,19 @@ Public Class MSSQLServer End Using End Function - Public Function GetDatatable(SqlCommand As String, Transaction As SqlTransaction) As DataTable + Public Function GetDatatable(SqlCommand As String, Transaction As SqlTransaction, Optional Timeout As Integer = 120) As DataTable Using oSqlConnection = GetSQLConnection() - Return GetDatatableWithConnectionObject(SqlCommand, oSqlConnection, TransactionMode.ExternalTransaction, Transaction) + Return GetDatatableWithConnectionObject(SqlCommand, oSqlConnection, TransactionMode.ExternalTransaction, Transaction, Timeout) End Using End Function - Public Async Function GetDatatableAsync(SqlCommand As String) As Task(Of DataTable) - Return Await Task.Run(Function() GetDatatable(SqlCommand, _Timeout)) + Public Async Function GetDatatableAsync(SqlCommand As String, Optional Timeout As Integer = 120) As Task(Of DataTable) + Return Await Task.Run(Function() GetDatatable(SqlCommand, Timeout)) End Function - Public Function GetDatatableWithConnection(SqlCommand As String, ConnectionString As String) As DataTable + Public Function GetDatatableWithConnection(SqlCommand As String, ConnectionString As String, Optional Timeout As Integer = 120) As DataTable Using oConnection = GetConnection(ConnectionString) - Return GetDatatableWithConnectionObject(SqlCommand, oConnection) + Return GetDatatableWithConnectionObject(SqlCommand, oConnection, Timeout:=Timeout) End Using End Function @@ -278,30 +278,30 @@ Public Class MSSQLServer Public Function ExecuteNonQuery(SQLCommand As String) As Boolean Implements IDatabase.ExecuteNonQuery Using oConnection = GetSQLConnection() - Return ExecuteNonQueryWithConnectionObject(SQLCommand, oConnection, TransactionMode.WithTransaction, Nothing, TIMEOUT_DEFAULT) + Return ExecuteNonQueryWithConnectionObject(SQLCommand, oConnection, TransactionMode.WithTransaction, Nothing, _Timeout) End Using End Function Public Function ExecuteNonQuery(SQLCommand As String, Timeout As Integer) As Boolean Implements IDatabase.ExecuteNonQuery Using oConnection = GetSQLConnection() - Return ExecuteNonQueryWithConnectionObject(SQLCommand, oConnection, TransactionMode.WithTransaction, Nothing, TIMEOUT_DEFAULT) + Return ExecuteNonQueryWithConnectionObject(SQLCommand, oConnection, TransactionMode.WithTransaction, Nothing, Timeout) End Using End Function - Public Function ExecuteNonQuery(SQLCommand As String, Transaction As SqlTransaction) As Boolean + Public Function ExecuteNonQuery(SQLCommand As String, Transaction As SqlTransaction, Optional Timeout As Integer = 120) As Boolean Using oConnection = GetSQLConnection() - Return ExecuteNonQueryWithConnectionObject(SQLCommand, oConnection, TransactionMode.ExternalTransaction, Transaction, TIMEOUT_DEFAULT) + Return ExecuteNonQueryWithConnectionObject(SQLCommand, oConnection, TransactionMode.ExternalTransaction, Transaction, Timeout) End Using End Function - Public Async Function ExecuteNonQueryAsync(SQLCommand As String) As Task(Of Boolean) - Return Await Task.Run(Function() ExecuteNonQuery(SQLCommand)) + Public Async Function ExecuteNonQueryAsync(SQLCommand As String, Optional Timeout As Integer = 120) As Task(Of Boolean) + Return Await Task.Run(Function() ExecuteNonQuery(SQLCommand, Timeout)) End Function - Public Function ExecuteNonQueryWithConnection(pSQLCommand As String, ConnString As String) As Boolean + Public Function ExecuteNonQueryWithConnection(pSQLCommand As String, ConnString As String, Optional Timeout As Integer = 120) As Boolean Using oConnection = GetConnection(ConnString) - Return ExecuteNonQueryWithConnectionObject(pSQLCommand, oConnection) + Return ExecuteNonQueryWithConnectionObject(pSQLCommand, oConnection, TransactionMode.WithTransaction, Nothing, Timeout) End Using End Function @@ -342,19 +342,19 @@ Public Class MSSQLServer End Using End Function - Public Function GetScalarValue(SQLCommand As String, Transaction As SqlTransaction) As Object + Public Function GetScalarValue(SQLCommand As String, Transaction As SqlTransaction, Optional Timeout As Integer = 120) As Object Using oConnection = GetSQLConnection() - Return GetScalarValueWithConnectionObject(SQLCommand, oConnection, TransactionMode.ExternalTransaction, Transaction) + Return GetScalarValueWithConnectionObject(SQLCommand, oConnection, TransactionMode.ExternalTransaction, Transaction, Timeout) End Using End Function - Public Async Function GetScalarValueAsync(SQLQuery As String) As Task(Of Object) - Return Await Task.Run(Function() GetScalarValue(SQLQuery, _Timeout)) + Public Async Function GetScalarValueAsync(SQLQuery As String, Optional Timeout As Integer = 120) As Task(Of Object) + Return Await Task.Run(Function() GetScalarValue(SQLQuery, Timeout)) End Function - Public Function GetScalarValueWithConnection(SQLCommand As String, ConnectionString As String) As Object + Public Function GetScalarValueWithConnection(SQLCommand As String, ConnectionString As String, Optional Timeout As Integer = 120) As Object Using oConnection = GetConnection(ConnectionString) - Return GetScalarValueWithConnectionObject(SQLCommand, oConnection) + Return GetScalarValueWithConnectionObject(SQLCommand, oConnection, TransactionMode.WithTransaction, Nothing, Timeout) End Using End Function From c11533a2e4bde87898dc56f93fc825ffeb361ded Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 5 May 2021 15:02:19 +0200 Subject: [PATCH 76/82] Database: Version 2.1.0 --- Modules.Database/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules.Database/My Project/AssemblyInfo.vb b/Modules.Database/My Project/AssemblyInfo.vb index cd527ffa..4d40677c 100644 --- a/Modules.Database/My Project/AssemblyInfo.vb +++ b/Modules.Database/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + From b9c7a23ddd21815d894a4880fd03934c42557ec1 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 5 May 2021 15:04:51 +0200 Subject: [PATCH 77/82] EDMIService: Apply timeout of 4 minutes for datatable jobs --- Service.EDMIService/Scheduler/DatatableJob.vb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Service.EDMIService/Scheduler/DatatableJob.vb b/Service.EDMIService/Scheduler/DatatableJob.vb index f5636425..da42a1e2 100644 --- a/Service.EDMIService/Scheduler/DatatableJob.vb +++ b/Service.EDMIService/Scheduler/DatatableJob.vb @@ -9,6 +9,8 @@ Imports Quartz Public Class DatatableJob Implements IJob + Private Const COMMAND_SQL_TIMEOUT = 240 + Private _MSSQL As MSSQLServer Public Function Execute(context As IJobExecutionContext) As Task Implements IJob.Execute @@ -41,7 +43,8 @@ Public Class DatatableJob oLogger.Debug("Connection Id: {0}", oConnectionId) Dim oConnectionString = oMSSQL.Get_ConnectionStringforID(oConnectionId) - Dim oTable = oMSSQL.GetDatatableWithConnection(oSQL, oConnectionString) + + Dim oTable = oMSSQL.GetDatatableWithConnection(oSQL, oConnectionString, COMMAND_SQL_TIMEOUT) oTable.TableName = oDatatableName oLogger.Debug("Result Datatable [{0}] contains [{1}] rows", oTable.TableName, oTable.Rows.Count) From 2a9162ff63d9e8e4b01bf6deb75dd9ec7525cfda Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 5 May 2021 15:05:10 +0200 Subject: [PATCH 78/82] EDMIService: switch to x64 --- Service.EDMIService/EDMIService.vbproj | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Service.EDMIService/EDMIService.vbproj b/Service.EDMIService/EDMIService.vbproj index 6419ef82..e42dc00c 100644 --- a/Service.EDMIService/EDMIService.vbproj +++ b/Service.EDMIService/EDMIService.vbproj @@ -31,14 +31,16 @@ true - AnyCPU + x64 true full true true bin\Debug\ - EDMIService.xml + + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + false AnyCPU @@ -47,7 +49,8 @@ true true bin\Release\ - EDMIService.xml + + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 From 8a1c4315c0aa184d7b83fcc4d0e73c90889f4f33 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 5 May 2021 15:05:52 +0200 Subject: [PATCH 79/82] EDMIService: 2.1.0 --- Service.EDMIService/My Project/AssemblyInfo.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Service.EDMIService/My Project/AssemblyInfo.vb b/Service.EDMIService/My Project/AssemblyInfo.vb index 14804c26..6d6356e2 100644 --- a/Service.EDMIService/My Project/AssemblyInfo.vb +++ b/Service.EDMIService/My Project/AssemblyInfo.vb @@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + From deec4e8bac39bee455950bf315e8c13652d41e71 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 6 May 2021 10:33:21 +0200 Subject: [PATCH 80/82] TestGUI: Add Checksum form --- GUIs.Test.TestGUI/TestGUI.vbproj | 9 ++ GUIs.Test.TestGUI/frmChecksum.Designer.vb | 79 ++++++++++++++ GUIs.Test.TestGUI/frmChecksum.resx | 123 ++++++++++++++++++++++ GUIs.Test.TestGUI/frmChecksum.vb | 22 ++++ GUIs.Test.TestGUI/frmLookup.vb | 2 +- GUIs.Test.TestGUI/frmStart.Designer.vb | 12 +++ GUIs.Test.TestGUI/frmStart.vb | 4 + 7 files changed, 250 insertions(+), 1 deletion(-) create mode 100644 GUIs.Test.TestGUI/frmChecksum.Designer.vb create mode 100644 GUIs.Test.TestGUI/frmChecksum.resx create mode 100644 GUIs.Test.TestGUI/frmChecksum.vb diff --git a/GUIs.Test.TestGUI/TestGUI.vbproj b/GUIs.Test.TestGUI/TestGUI.vbproj index a9ba4c44..b4ccc364 100644 --- a/GUIs.Test.TestGUI/TestGUI.vbproj +++ b/GUIs.Test.TestGUI/TestGUI.vbproj @@ -113,6 +113,12 @@ + + frmChecksum.vb + + + Form + frmConfigTest.vb @@ -173,6 +179,9 @@ + + frmChecksum.vb + frmConfigTest.vb diff --git a/GUIs.Test.TestGUI/frmChecksum.Designer.vb b/GUIs.Test.TestGUI/frmChecksum.Designer.vb new file mode 100644 index 00000000..4b1aa902 --- /dev/null +++ b/GUIs.Test.TestGUI/frmChecksum.Designer.vb @@ -0,0 +1,79 @@ + _ +Partial Class frmChecksum + Inherits System.Windows.Forms.Form + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog() + Me.TextBox1 = New System.Windows.Forms.TextBox() + Me.Button1 = New System.Windows.Forms.Button() + Me.Button3 = New System.Windows.Forms.Button() + Me.SuspendLayout() + ' + 'OpenFileDialog1 + ' + Me.OpenFileDialog1.FileName = "OpenFileDialog1" + ' + 'TextBox1 + ' + Me.TextBox1.Location = New System.Drawing.Point(12, 12) + Me.TextBox1.Name = "TextBox1" + Me.TextBox1.Size = New System.Drawing.Size(553, 20) + Me.TextBox1.TabIndex = 0 + ' + 'Button1 + ' + Me.Button1.Location = New System.Drawing.Point(571, 10) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(75, 23) + Me.Button1.TabIndex = 2 + Me.Button1.Text = "Datei 1" + Me.Button1.UseVisualStyleBackColor = True + ' + 'Button3 + ' + Me.Button3.Location = New System.Drawing.Point(652, 10) + Me.Button3.Name = "Button3" + Me.Button3.Size = New System.Drawing.Size(145, 23) + Me.Button3.TabIndex = 2 + Me.Button3.Text = "Prüfsumme berechnen" + Me.Button3.UseVisualStyleBackColor = True + ' + 'frmChecksum + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(800, 450) + Me.Controls.Add(Me.Button3) + Me.Controls.Add(Me.Button1) + Me.Controls.Add(Me.TextBox1) + Me.Name = "frmChecksum" + Me.Text = "frmChecksum" + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents OpenFileDialog1 As OpenFileDialog + Friend WithEvents TextBox1 As TextBox + Friend WithEvents Button1 As Button + Friend WithEvents Button3 As Button +End Class diff --git a/GUIs.Test.TestGUI/frmChecksum.resx b/GUIs.Test.TestGUI/frmChecksum.resx new file mode 100644 index 00000000..33c7f672 --- /dev/null +++ b/GUIs.Test.TestGUI/frmChecksum.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + \ No newline at end of file diff --git a/GUIs.Test.TestGUI/frmChecksum.vb b/GUIs.Test.TestGUI/frmChecksum.vb new file mode 100644 index 00000000..48c77d71 --- /dev/null +++ b/GUIs.Test.TestGUI/frmChecksum.vb @@ -0,0 +1,22 @@ +Imports DigitalData.Modules.Logging + +Public Class frmChecksum + Private LogConfig As LogConfig + Private FileEx As DigitalData.Modules.Filesystem.File + + Private Sub frmChecksum_Load(sender As Object, e As EventArgs) Handles MyBase.Load + LogConfig = New LogConfig(LogConfig.PathType.Temp) + FileEx = New DigitalData.Modules.Filesystem.File(LogConfig) + End Sub + + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + If OpenFileDialog1.ShowDialog() = DialogResult.OK Then + TextBox1.Text = OpenFileDialog1.FileName + End If + End Sub + + Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click + Dim oChecksum = FileEx.GetChecksum(TextBox1.Text) + MsgBox(oChecksum) + End Sub +End Class \ No newline at end of file diff --git a/GUIs.Test.TestGUI/frmLookup.vb b/GUIs.Test.TestGUI/frmLookup.vb index 7a1a3257..39a5fdc9 100644 --- a/GUIs.Test.TestGUI/frmLookup.vb +++ b/GUIs.Test.TestGUI/frmLookup.vb @@ -11,7 +11,7 @@ Public Class frmLookup InitializeComponent() ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. - Localizer.Active = New LookupGridLocalizer() + 'Localizer.Active = New LookupGridLocalizer() End Sub Private Sub frmLookup_Load(sender As Object, e As EventArgs) Handles MyBase.Load diff --git a/GUIs.Test.TestGUI/frmStart.Designer.vb b/GUIs.Test.TestGUI/frmStart.Designer.vb index 2418a6c7..4bb83fcf 100644 --- a/GUIs.Test.TestGUI/frmStart.Designer.vb +++ b/GUIs.Test.TestGUI/frmStart.Designer.vb @@ -26,6 +26,7 @@ Partial Class frmStart Me.Button2 = New System.Windows.Forms.Button() Me.Button3 = New System.Windows.Forms.Button() Me.Button4 = New System.Windows.Forms.Button() + Me.Button5 = New System.Windows.Forms.Button() Me.SuspendLayout() ' 'Button1 @@ -64,11 +65,21 @@ Partial Class frmStart Me.Button4.Text = "Skalierungsfaktor" Me.Button4.UseVisualStyleBackColor = True ' + 'Button5 + ' + Me.Button5.Location = New System.Drawing.Point(12, 260) + Me.Button5.Name = "Button5" + Me.Button5.Size = New System.Drawing.Size(236, 60) + Me.Button5.TabIndex = 2 + Me.Button5.Text = "Button5" + Me.Button5.UseVisualStyleBackColor = True + ' 'frmStart ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(800, 450) + Me.Controls.Add(Me.Button5) Me.Controls.Add(Me.Button4) Me.Controls.Add(Me.Button3) Me.Controls.Add(Me.Button2) @@ -83,4 +94,5 @@ Partial Class frmStart Friend WithEvents Button2 As Button Friend WithEvents Button3 As Button Friend WithEvents Button4 As Button + Friend WithEvents Button5 As Button End Class diff --git a/GUIs.Test.TestGUI/frmStart.vb b/GUIs.Test.TestGUI/frmStart.vb index d8b40900..ce2fcd0f 100644 --- a/GUIs.Test.TestGUI/frmStart.vb +++ b/GUIs.Test.TestGUI/frmStart.vb @@ -18,4 +18,8 @@ Public Class frmStart MsgBox("Scaling: " & oScreen.GetScreenScaling(Me)) End Sub + + Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click + frmChecksum.Show() + End Sub End Class \ No newline at end of file From e0612bc0d3832f164e9a5bee0c9d3e8e6688a3b8 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 6 May 2021 10:33:59 +0200 Subject: [PATCH 81/82] LookupGrid: Update NullText for initial state --- Controls.LookupGrid/LookupControl3.vb | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Controls.LookupGrid/LookupControl3.vb b/Controls.LookupGrid/LookupControl3.vb index a107ee38..8ee90c69 100644 --- a/Controls.LookupGrid/LookupControl3.vb +++ b/Controls.LookupGrid/LookupControl3.vb @@ -48,6 +48,7 @@ Public Class RepositoryItemLookupControl3 Public Sub New() SetDropdownButtonEnabled(_MultiSelect) + UpdateSelectedValues(New List(Of String)) End Sub Private Const NAME_DATATABLE_INTERNAL = "__INTERNAL_DATATABLE__" @@ -159,14 +160,19 @@ Public Class RepositoryItemLookupControl3 If MultiSelect = True Then Select Case Values.Count Case 0 - NullText = String.Empty + NullText = String.Format(_R.GetString("LookupControl_NoRecords")) Case 1 NullText = Values.FirstOrDefault() Case Else NullText = String.Format(_R.GetString("LookupControl_NRecords"), Values.Count) End Select Else - NullText = Values.FirstOrDefault() + Select Case Values.Count + Case 0 + NullText = String.Format(_R.GetString("LookupControl_NoRecords")) + Case Else + NullText = Values.FirstOrDefault() + End Select End If ' If No external Datasource is supplied, create one containing the currently selected values @@ -191,6 +197,10 @@ Public Class RepositoryItemLookupControl3 RaiseEvent SelectedValuesChanged(Me, Values) End Sub + Protected Overrides Function ShouldSerializeNullText() As Boolean + Return False + End Function + Public Overrides Sub CreateDefaultButton() Dim oButtons As New List(Of EditorButton) From { New EditorButton() With { From 561b5b2f929ec32883abc35d55572de579a5ce69 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 6 May 2021 10:34:41 +0200 Subject: [PATCH 82/82] LookupGrid: Version 3.2.0 --- Controls.LookupGrid/My Project/AssemblyInfo.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Controls.LookupGrid/My Project/AssemblyInfo.vb b/Controls.LookupGrid/My Project/AssemblyInfo.vb index b6e9c065..ceebfafc 100644 --- a/Controls.LookupGrid/My Project/AssemblyInfo.vb +++ b/Controls.LookupGrid/My Project/AssemblyInfo.vb @@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + +