From 099d65ed7023e4d95a0c552b4ef91963d0a6d077 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 16 Mar 2021 11:38:07 +0100 Subject: [PATCH 1/8] Zooflow: frmtest streams --- GUIs.ZooFlow/frmtest.vb | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/GUIs.ZooFlow/frmtest.vb b/GUIs.ZooFlow/frmtest.vb index a693dd87..aaf6586e 100644 --- a/GUIs.ZooFlow/frmtest.vb +++ b/GUIs.ZooFlow/frmtest.vb @@ -20,33 +20,34 @@ Public Class frmtest Private Async Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click Try - Dim oResult As Boolean - Dim oStream As New FileStream(txtFile2Import.Text, FileMode.Open) - Dim oContents(oStream.Length) As Byte - 'Dim oBytesRead = Await oStream.ReadAsync(oContents, 0, oStream.Length) + Dim oResult As Boolean = False + + Using oStream As New FileStream(txtFile2Import.Text, FileMode.Open, FileAccess.Read) + Dim oContents(oStream.Length) As Byte + oStream.Read(oContents, 0, oStream.Length) + + oResult = Await _Client.ImportIDBFOAsync(oContents, My.Application.User.UserName, txtIDB_OBJ_ID.Text, 1, txtIDBFOPath.Text) + End Using - oResult = Await _Client.ImportIDBFOAsync(oContents, My.Application.User.UserName, txtIDB_OBJ_ID.Text, 1, txtIDBFOPath.Text) If oResult = False Then MsgBox("Oh no error", MsgBoxStyle.Critical) Else MsgBox("#Nailedit") - End If Catch ex As Exception MsgBox(ex.Message) End Try - End Sub Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click Dim memString As String = "Memory test string !!!" + Dim buffer As Byte() = Encoding.UTF8.GetBytes(memString) + ' convert string to stream - Dim buffer As Byte() = Encoding.ASCII.GetBytes(memString) - Dim ms As New MemoryStream(buffer) - 'write to file - Dim file As New FileStream("d:\file.txt", FileMode.Create, FileAccess.Write) - ms.WriteTo(file) - file.Close() - ms.Close() + Using oMemoryStream As New MemoryStream(buffer) + Using oFileStream As New FileStream("d:\file.txt", FileMode.Create, FileAccess.Write) + oMemoryStream.WriteTo(oFileStream) + End Using + End Using End Sub End Class \ No newline at end of file From 64137a297c5fed119845b5c7ba3e4ece1e7f2546 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 17 Mar 2021 10:25:23 +0100 Subject: [PATCH 2/8] Zooflow: administration --- .../frmAdmin_CWDataSearch.Designer.vb | 114 ++ .../Administration/frmAdmin_CWDataSearch.resx | 120 ++ .../Administration/frmAdmin_CWDataSearch.vb | 11 + .../frmAdmin_CWProfile.Designer.vb | 175 +-- .../Administration/frmAdmin_CWProfile.vb | 4 - .../frmAdmin_IDBAttribute.Designer.vb | 175 ++- .../Administration/frmAdmin_IDBAttribute.resx | 19 +- .../Administration/frmAdmin_IDBAttribute.vb | 15 +- .../Administration/frmAdmin_IDBEntity.vb | 1 - .../Administration/frmAdmin_Interface.vb | 1 - .../Administration/frmAdmin_Start.Designer.vb | 455 +++++- .../Administration/frmAdmin_Start.resx | 15 +- GUIs.ZooFlow/Administration/frmAdmin_Start.vb | 8 +- .../Administration/frmGlobix_Dokumentart.vb | 4 +- GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb | 1359 ++++++++++++++--- GUIs.ZooFlow/DSIDB_Stammdaten.xsd | 113 +- GUIs.ZooFlow/DSIDB_Stammdaten.xss | 11 +- GUIs.ZooFlow/My Project/Resources.Designer.vb | 170 +++ GUIs.ZooFlow/My Project/Resources.resx | 243 +-- GUIs.ZooFlow/My Project/licenses.licx | 23 +- .../Resources/actions_addcircled2.svg | 15 + .../Resources/actions_addcircled3.svg | 15 + .../Resources/actions_addcircled4.svg | 15 + GUIs.ZooFlow/Resources/actions_check3.svg | 15 + .../Resources/actions_deletecircled1.svg | 15 + .../Resources/actions_deletecircled2.svg | 15 + .../Resources/actions_deletecircled3.svg | 15 + .../Resources/actions_deletecircled4.svg | 15 + .../Resources/actions_deletecircled5.svg | 15 + .../Resources/definednameuseinformula.svg | 9 + GUIs.ZooFlow/Resources/doublenext.svg | 11 + GUIs.ZooFlow/Resources/doublenext1.svg | 11 + GUIs.ZooFlow/Resources/doublenext2.svg | 11 + GUIs.ZooFlow/Resources/renamedatasource.svg | 20 + GUIs.ZooFlow/Resources/save4.svg | 7 + GUIs.ZooFlow/Resources/save5.svg | 7 + GUIs.ZooFlow/Resources/save6.svg | 7 + GUIs.ZooFlow/ZooFlow.vbproj | 60 + 38 files changed, 2741 insertions(+), 573 deletions(-) create mode 100644 GUIs.ZooFlow/Administration/frmAdmin_CWDataSearch.Designer.vb create mode 100644 GUIs.ZooFlow/Administration/frmAdmin_CWDataSearch.resx create mode 100644 GUIs.ZooFlow/Administration/frmAdmin_CWDataSearch.vb create mode 100644 GUIs.ZooFlow/Resources/actions_addcircled2.svg create mode 100644 GUIs.ZooFlow/Resources/actions_addcircled3.svg create mode 100644 GUIs.ZooFlow/Resources/actions_addcircled4.svg create mode 100644 GUIs.ZooFlow/Resources/actions_check3.svg create mode 100644 GUIs.ZooFlow/Resources/actions_deletecircled1.svg create mode 100644 GUIs.ZooFlow/Resources/actions_deletecircled2.svg create mode 100644 GUIs.ZooFlow/Resources/actions_deletecircled3.svg create mode 100644 GUIs.ZooFlow/Resources/actions_deletecircled4.svg create mode 100644 GUIs.ZooFlow/Resources/actions_deletecircled5.svg create mode 100644 GUIs.ZooFlow/Resources/definednameuseinformula.svg create mode 100644 GUIs.ZooFlow/Resources/doublenext.svg create mode 100644 GUIs.ZooFlow/Resources/doublenext1.svg create mode 100644 GUIs.ZooFlow/Resources/doublenext2.svg create mode 100644 GUIs.ZooFlow/Resources/renamedatasource.svg create mode 100644 GUIs.ZooFlow/Resources/save4.svg create mode 100644 GUIs.ZooFlow/Resources/save5.svg create mode 100644 GUIs.ZooFlow/Resources/save6.svg diff --git a/GUIs.ZooFlow/Administration/frmAdmin_CWDataSearch.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_CWDataSearch.Designer.vb new file mode 100644 index 00000000..e1c28608 --- /dev/null +++ b/GUIs.ZooFlow/Administration/frmAdmin_CWDataSearch.Designer.vb @@ -0,0 +1,114 @@ + _ +Partial Class frmAdmin_CWDataSearch + Inherits frmAdmin_Base + + '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.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.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'RibbonControl1 + ' + Me.RibbonControl1.CommandLayout = DevExpress.XtraBars.Ribbon.CommandLayout.Simplified + Me.RibbonControl1.ExpandCollapseItem.Id = 0 + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.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(800, 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.GUIs.ZooFlow.My.Resources.Resources.actions_check3 + Me.BarButtonItem1.Name = "BarButtonItem1" + ' + 'BarButtonItem2 + ' + Me.BarButtonItem2.Caption = "Speichern" + Me.BarButtonItem2.Id = 2 + Me.BarButtonItem2.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.save6 + 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, 428) + Me.RibbonStatusBar1.Name = "RibbonStatusBar1" + Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 + Me.RibbonStatusBar1.Size = New System.Drawing.Size(800, 22) + ' + 'RibbonPage2 + ' + Me.RibbonPage2.Name = "RibbonPage2" + Me.RibbonPage2.Text = "RibbonPage2" + ' + 'frmAdmin_CWDataSearch + ' + 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.RibbonStatusBar1) + Me.Controls.Add(Me.RibbonControl1) + Me.Name = "frmAdmin_CWDataSearch" + Me.Ribbon = Me.RibbonControl1 + Me.StatusBar = Me.RibbonStatusBar1 + Me.Text = "Clipboard Watcher - Datensuche" + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() + 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 BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem +End Class diff --git a/GUIs.ZooFlow/Administration/frmAdmin_CWDataSearch.resx b/GUIs.ZooFlow/Administration/frmAdmin_CWDataSearch.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/GUIs.ZooFlow/Administration/frmAdmin_CWDataSearch.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.ZooFlow/Administration/frmAdmin_CWDataSearch.vb b/GUIs.ZooFlow/Administration/frmAdmin_CWDataSearch.vb new file mode 100644 index 00000000..e6ee211c --- /dev/null +++ b/GUIs.ZooFlow/Administration/frmAdmin_CWDataSearch.vb @@ -0,0 +1,11 @@ +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 +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 6f41c31e..498ec7b8 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb @@ -44,22 +44,22 @@ Partial Class frmAdmin_CWProfile Me.txtAddedWhen = New DevExpress.XtraEditors.TextEdit() 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.Root = New DevExpress.XtraLayout.LayoutControlGroup() - Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem() - Me.CheckEdit1 = New DevExpress.XtraEditors.CheckEdit() - Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem() - Me.TextEdit4 = New DevExpress.XtraEditors.TextEdit() - Me.LayoutControlItem9 = New DevExpress.XtraLayout.LayoutControlItem() - Me.TextEdit5 = New DevExpress.XtraEditors.TextEdit() Me.LayoutControlItem10 = New DevExpress.XtraLayout.LayoutControlItem() - Me.SimpleButton1 = New DevExpress.XtraEditors.SimpleButton() + Me.LayoutControlItem9 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem11 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DBCW_Stammdaten, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBCW_PROFILESBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() @@ -72,21 +72,21 @@ Partial Class frmAdmin_CWProfile CType(Me.txtAddedWhen.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtChangedWho.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtChangedWhen.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.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.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.CheckEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TextEdit4.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TextEdit5.Properties, 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() Me.SuspendLayout() ' 'RibbonControl1 @@ -125,6 +125,7 @@ Partial Class frmAdmin_CWProfile Me.labelStatus.Id = 3 Me.labelStatus.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.about3 Me.labelStatus.Name = "labelStatus" + Me.labelStatus.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph Me.labelStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing ' 'labelError @@ -273,6 +274,45 @@ Partial Class frmAdmin_CWProfile 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.MenuManager = Me.RibbonControl1 + Me.CheckEdit1.Name = "CheckEdit1" + Me.CheckEdit1.Properties.Caption = "Aktiv" + Me.CheckEdit1.Size = New System.Drawing.Size(370, 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.MenuManager = Me.RibbonControl1 + Me.TextEdit4.Name = "TextEdit4" + Me.TextEdit4.Size = New System.Drawing.Size(635, 20) + 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(635, 20) + Me.TextEdit5.StyleController = Me.LayoutControl1 + Me.TextEdit5.TabIndex = 13 + ' + 'SimpleButton1 + ' + Me.SimpleButton1.Location = New System.Drawing.Point(12, 212) + Me.SimpleButton1.Name = "SimpleButton1" + Me.SimpleButton1.Size = New System.Drawing.Size(776, 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] @@ -282,16 +322,6 @@ Partial Class frmAdmin_CWProfile Me.Root.Size = New System.Drawing.Size(800, 362) Me.Root.TextVisible = False ' - 'LayoutControlItem1 - ' - 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.Text = "GUID" - Me.LayoutControlItem1.TextSize = New System.Drawing.Size(122, 13) - ' 'LayoutControlItem2 ' Me.LayoutControlItem2.Control = Me.TextEdit2 @@ -352,56 +382,6 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem7.Text = "Geändert Wann" Me.LayoutControlItem7.TextSize = New System.Drawing.Size(122, 13) ' - '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.MenuManager = Me.RibbonControl1 - Me.CheckEdit1.Name = "CheckEdit1" - Me.CheckEdit1.Properties.Caption = "Aktiv" - Me.CheckEdit1.Size = New System.Drawing.Size(370, 18) - Me.CheckEdit1.StyleController = Me.LayoutControl1 - Me.CheckEdit1.TabIndex = 11 - ' - 'LayoutControlItem8 - ' - Me.LayoutControlItem8.Control = Me.CheckEdit1 - Me.LayoutControlItem8.Location = New System.Drawing.Point(390, 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.TextSize = New System.Drawing.Size(0, 0) - Me.LayoutControlItem8.TextVisible = False - ' - '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.MenuManager = Me.RibbonControl1 - Me.TextEdit4.Name = "TextEdit4" - Me.TextEdit4.Size = New System.Drawing.Size(635, 20) - Me.TextEdit4.StyleController = Me.LayoutControl1 - Me.TextEdit4.TabIndex = 12 - ' - 'LayoutControlItem9 - ' - Me.LayoutControlItem9.Control = Me.TextEdit4 - Me.LayoutControlItem9.Location = New System.Drawing.Point(0, 120) - 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.Text = "Regular Expression" - Me.LayoutControlItem9.TextSize = New System.Drawing.Size(122, 13) - ' - '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(635, 20) - Me.TextEdit5.StyleController = Me.LayoutControl1 - Me.TextEdit5.TabIndex = 13 - ' 'LayoutControlItem10 ' Me.LayoutControlItem10.Control = Me.TextEdit5 @@ -412,14 +392,15 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem10.Text = "Regular Expression Test" Me.LayoutControlItem10.TextSize = New System.Drawing.Size(122, 13) ' - 'SimpleButton1 + 'LayoutControlItem9 ' - Me.SimpleButton1.Location = New System.Drawing.Point(12, 212) - Me.SimpleButton1.Name = "SimpleButton1" - Me.SimpleButton1.Size = New System.Drawing.Size(776, 22) - Me.SimpleButton1.StyleController = Me.LayoutControl1 - Me.SimpleButton1.TabIndex = 14 - Me.SimpleButton1.Text = "Regular Expression prüfen" + Me.LayoutControlItem9.Control = Me.TextEdit4 + Me.LayoutControlItem9.Location = New System.Drawing.Point(0, 120) + 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.Text = "Regular Expression" + Me.LayoutControlItem9.TextSize = New System.Drawing.Size(122, 13) ' 'LayoutControlItem11 ' @@ -431,6 +412,26 @@ Partial Class frmAdmin_CWProfile Me.LayoutControlItem11.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem11.TextVisible = False ' + 'LayoutControlItem8 + ' + Me.LayoutControlItem8.Control = Me.CheckEdit1 + Me.LayoutControlItem8.Location = New System.Drawing.Point(390, 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.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem8.TextVisible = False + ' + 'LayoutControlItem1 + ' + 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.Text = "GUID" + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(122, 13) + ' 'frmAdmin_CWProfile ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -442,7 +443,7 @@ Partial Class frmAdmin_CWProfile Me.Name = "frmAdmin_CWProfile" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 - Me.Text = "Clipboard Watcher - Profile" + Me.Text = "Clipboard Watcher - Profil" CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DBCW_Stammdaten, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBCW_PROFILESBindingSource, System.ComponentModel.ISupportInitialize).EndInit() @@ -455,21 +456,21 @@ Partial Class frmAdmin_CWProfile CType(Me.txtAddedWhen.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtChangedWho.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtChangedWhen.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.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.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.CheckEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TextEdit4.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TextEdit5.Properties, 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() Me.ResumeLayout(False) Me.PerformLayout() diff --git a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb index 7346c63f..81393c08 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb @@ -4,13 +4,9 @@ Public Class frmAdmin_CWProfile 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 - Private Property Logger As Logger Implements frmAdmin_Interface.Logger - Public Sub New(PrimaryKey As Integer) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb index 03896bda..78fc24cf 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb @@ -33,7 +33,7 @@ Partial Class frmAdmin_IDBAttribute Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit() - Me.TBIDB_ATTRIBUTEBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.VWIDB_BE_ATTRIBUTEBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.DSIDB_Stammdaten = New DigitalData.GUIs.ZooFlow.DSIDB_Stammdaten() Me.TextEdit2 = New DevExpress.XtraEditors.TextEdit() Me.SpinEdit1 = New DevExpress.XtraEditors.SpinEdit() @@ -44,7 +44,8 @@ Partial Class frmAdmin_IDBAttribute Me.txtAddedWhen = New DevExpress.XtraEditors.TextEdit() Me.txtChangedWho = New DevExpress.XtraEditors.TextEdit() Me.txtChangedWhen = New DevExpress.XtraEditors.TextEdit() - Me.ComboBoxEdit1 = New DevExpress.XtraEditors.ComboBoxEdit() + Me.ComboBoxEdit1 = New DevExpress.XtraEditors.LookUpEdit() + Me.TBIDB_ATTRIBUTE_TYPEBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() @@ -57,13 +58,14 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem10 = New DevExpress.XtraLayout.LayoutControlItem() - Me.TBIDB_ATTRIBUTETableAdapter = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TBIDB_ATTRIBUTETableAdapter() Me.TableAdapterManager = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager() + Me.VWIDB_BE_ATTRIBUTETableAdapter = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.VWIDB_BE_ATTRIBUTETableAdapter() + Me.TBIDB_ATTRIBUTE_TYPETableAdapter = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TBIDB_ATTRIBUTE_TYPETableAdapter() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.LayoutControl1.SuspendLayout() CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TBIDB_ATTRIBUTEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.VWIDB_BE_ATTRIBUTEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DSIDB_Stammdaten, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SpinEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() @@ -75,6 +77,7 @@ Partial Class frmAdmin_IDBAttribute CType(Me.txtChangedWho.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtChangedWhen.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TBIDB_ATTRIBUTE_TYPEBindingSource, 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() @@ -100,7 +103,7 @@ Partial Class frmAdmin_IDBAttribute Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide - Me.RibbonControl1.Size = New System.Drawing.Size(800, 63) + Me.RibbonControl1.Size = New System.Drawing.Size(857, 66) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' 'BarButtonItem1 @@ -142,10 +145,10 @@ Partial Class frmAdmin_IDBAttribute 'RibbonStatusBar1 ' Me.RibbonStatusBar1.ItemLinks.Add(Me.labelStatus) - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 426) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 502) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(800, 24) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(857, 22) ' 'RibbonPage2 ' @@ -166,28 +169,28 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControl1.Controls.Add(Me.txtChangedWhen) Me.LayoutControl1.Controls.Add(Me.ComboBoxEdit1) Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.LayoutControl1.Location = New System.Drawing.Point(0, 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(800, 363) + Me.LayoutControl1.Size = New System.Drawing.Size(857, 436) Me.LayoutControl1.TabIndex = 2 Me.LayoutControl1.Text = "LayoutControl1" ' 'TextEdit1 ' - Me.TextEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "GUID", True)) - Me.TextEdit1.Location = New System.Drawing.Point(154, 20) + Me.TextEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "ATTR_ID", True)) + Me.TextEdit1.Location = New System.Drawing.Point(168, 20) Me.TextEdit1.MenuManager = Me.RibbonControl1 Me.TextEdit1.Name = "TextEdit1" Me.TextEdit1.Properties.ReadOnly = True - Me.TextEdit1.Size = New System.Drawing.Size(626, 20) + Me.TextEdit1.Size = New System.Drawing.Size(669, 20) Me.TextEdit1.StyleController = Me.LayoutControl1 Me.TextEdit1.TabIndex = 4 ' - 'TBIDB_ATTRIBUTEBindingSource + 'VWIDB_BE_ATTRIBUTEBindingSource ' - Me.TBIDB_ATTRIBUTEBindingSource.DataMember = "TBIDB_ATTRIBUTE" - Me.TBIDB_ATTRIBUTEBindingSource.DataSource = Me.DSIDB_Stammdaten + Me.VWIDB_BE_ATTRIBUTEBindingSource.DataMember = "VWIDB_BE_ATTRIBUTE" + Me.VWIDB_BE_ATTRIBUTEBindingSource.DataSource = Me.DSIDB_Stammdaten ' 'DSIDB_Stammdaten ' @@ -196,120 +199,129 @@ Partial Class frmAdmin_IDBAttribute ' 'TextEdit2 ' - Me.TextEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "TITLE", True)) - Me.TextEdit2.Location = New System.Drawing.Point(154, 60) + Me.TextEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "ATTR_TITLE", True)) + Me.TextEdit2.Location = New System.Drawing.Point(168, 60) Me.TextEdit2.MenuManager = Me.RibbonControl1 Me.TextEdit2.Name = "TextEdit2" - Me.TextEdit2.Size = New System.Drawing.Size(626, 20) + Me.TextEdit2.Size = New System.Drawing.Size(669, 20) Me.TextEdit2.StyleController = Me.LayoutControl1 Me.TextEdit2.TabIndex = 5 ' 'SpinEdit1 ' - Me.SpinEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "VIEW_SEQUENCE", True)) + Me.SpinEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "VIEW_SEQUENCE", True)) Me.SpinEdit1.EditValue = New Decimal(New Integer() {0, 0, 0, 0}) - Me.SpinEdit1.Location = New System.Drawing.Point(544, 180) + Me.SpinEdit1.Location = New System.Drawing.Point(586, 180) Me.SpinEdit1.MenuManager = Me.RibbonControl1 Me.SpinEdit1.Name = "SpinEdit1" Me.SpinEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.SpinEdit1.Size = New System.Drawing.Size(236, 20) + Me.SpinEdit1.Size = New System.Drawing.Size(251, 20) Me.SpinEdit1.StyleController = Me.LayoutControl1 Me.SpinEdit1.TabIndex = 6 ' 'CheckEdit1 ' - Me.CheckEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "MULTI_CONTEXT", True)) Me.CheckEdit1.Location = New System.Drawing.Point(20, 220) Me.CheckEdit1.MenuManager = Me.RibbonControl1 Me.CheckEdit1.Name = "CheckEdit1" Me.CheckEdit1.Properties.Caption = "Attribut mehrzeilig" - Me.CheckEdit1.Size = New System.Drawing.Size(760, 20) + Me.CheckEdit1.Size = New System.Drawing.Size(817, 18) Me.CheckEdit1.StyleController = Me.LayoutControl1 Me.CheckEdit1.TabIndex = 7 ' 'CheckEdit2 ' - Me.CheckEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "VIEW_VISIBLE", True)) + Me.CheckEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "VIEW_VISIBLE", True)) Me.CheckEdit2.Location = New System.Drawing.Point(20, 180) Me.CheckEdit2.MenuManager = Me.RibbonControl1 Me.CheckEdit2.Name = "CheckEdit2" Me.CheckEdit2.Properties.Caption = "Standard in Ergebnisliste" - Me.CheckEdit2.Size = New System.Drawing.Size(370, 20) + Me.CheckEdit2.Size = New System.Drawing.Size(398, 18) Me.CheckEdit2.StyleController = Me.LayoutControl1 Me.CheckEdit2.TabIndex = 8 ' 'TextEdit3 ' - Me.TextEdit3.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "COMMENT", True)) - Me.TextEdit3.Location = New System.Drawing.Point(154, 140) + Me.TextEdit3.Location = New System.Drawing.Point(168, 140) Me.TextEdit3.MenuManager = Me.RibbonControl1 Me.TextEdit3.Name = "TextEdit3" - Me.TextEdit3.Size = New System.Drawing.Size(626, 20) + Me.TextEdit3.Size = New System.Drawing.Size(669, 20) Me.TextEdit3.StyleController = Me.LayoutControl1 Me.TextEdit3.TabIndex = 9 ' 'txtAddedWho ' - Me.txtAddedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "ADDED_WHO", True)) - Me.txtAddedWho.Location = New System.Drawing.Point(154, 260) + Me.txtAddedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "ADDED_WHO", True)) + Me.txtAddedWho.Location = New System.Drawing.Point(168, 258) Me.txtAddedWho.MenuManager = Me.RibbonControl1 Me.txtAddedWho.Name = "txtAddedWho" Me.txtAddedWho.Properties.ReadOnly = True - Me.txtAddedWho.Size = New System.Drawing.Size(236, 20) + Me.txtAddedWho.Size = New System.Drawing.Size(250, 20) Me.txtAddedWho.StyleController = Me.LayoutControl1 Me.txtAddedWho.TabIndex = 10 ' 'txtAddedWhen ' - Me.txtAddedWhen.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "ADDED_WHEN", True)) - Me.txtAddedWhen.Location = New System.Drawing.Point(544, 260) + Me.txtAddedWhen.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "ADDED_WHEN", True)) + Me.txtAddedWhen.Location = New System.Drawing.Point(586, 258) Me.txtAddedWhen.MenuManager = Me.RibbonControl1 Me.txtAddedWhen.Name = "txtAddedWhen" Me.txtAddedWhen.Properties.ReadOnly = True - Me.txtAddedWhen.Size = New System.Drawing.Size(236, 20) + Me.txtAddedWhen.Size = New System.Drawing.Size(251, 20) Me.txtAddedWhen.StyleController = Me.LayoutControl1 Me.txtAddedWhen.TabIndex = 11 ' 'txtChangedWho ' - Me.txtChangedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "CHANGED_WHO", True)) - Me.txtChangedWho.Location = New System.Drawing.Point(154, 300) + Me.txtChangedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "CHANGED_WHO", True)) + Me.txtChangedWho.Location = New System.Drawing.Point(168, 298) Me.txtChangedWho.MenuManager = Me.RibbonControl1 Me.txtChangedWho.Name = "txtChangedWho" Me.txtChangedWho.Properties.ReadOnly = True - Me.txtChangedWho.Size = New System.Drawing.Size(236, 20) + Me.txtChangedWho.Size = New System.Drawing.Size(250, 20) Me.txtChangedWho.StyleController = Me.LayoutControl1 Me.txtChangedWho.TabIndex = 12 ' 'txtChangedWhen ' - Me.txtChangedWhen.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "CHANGED_WHEN", True)) - Me.txtChangedWhen.Location = New System.Drawing.Point(544, 300) + Me.txtChangedWhen.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "CHANGED_WHEN", True)) + Me.txtChangedWhen.Location = New System.Drawing.Point(586, 298) Me.txtChangedWhen.MenuManager = Me.RibbonControl1 Me.txtChangedWhen.Name = "txtChangedWhen" Me.txtChangedWhen.Properties.ReadOnly = True - Me.txtChangedWhen.Size = New System.Drawing.Size(236, 20) + Me.txtChangedWhen.Size = New System.Drawing.Size(251, 20) Me.txtChangedWhen.StyleController = Me.LayoutControl1 Me.txtChangedWhen.TabIndex = 13 ' 'ComboBoxEdit1 ' - Me.ComboBoxEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "TYP_ID", True)) - Me.ComboBoxEdit1.Location = New System.Drawing.Point(154, 100) + Me.ComboBoxEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "TYPE_ID", True)) + Me.ComboBoxEdit1.Location = New System.Drawing.Point(168, 100) Me.ComboBoxEdit1.MenuManager = Me.RibbonControl1 Me.ComboBoxEdit1.Name = "ComboBoxEdit1" + Me.ComboBoxEdit1.Properties.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFit 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(626, 20) + Me.ComboBoxEdit1.Properties.DataSource = Me.TBIDB_ATTRIBUTE_TYPEBindingSource + Me.ComboBoxEdit1.Properties.DisplayMember = "NAME_TYPE" + Me.ComboBoxEdit1.Properties.NullText = "" + Me.ComboBoxEdit1.Properties.PopupSizeable = False + Me.ComboBoxEdit1.Properties.ValueMember = "GUID" + Me.ComboBoxEdit1.Size = New System.Drawing.Size(669, 20) Me.ComboBoxEdit1.StyleController = Me.LayoutControl1 Me.ComboBoxEdit1.TabIndex = 14 ' + 'TBIDB_ATTRIBUTE_TYPEBindingSource + ' + Me.TBIDB_ATTRIBUTE_TYPEBindingSource.DataMember = "TBIDB_ATTRIBUTE_TYPE" + Me.TBIDB_ATTRIBUTE_TYPEBindingSource.DataSource = Me.DSIDB_Stammdaten + ' '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.LayoutControlItem4, Me.LayoutControlItem6, Me.LayoutControlItem7, Me.LayoutControlItem3, Me.LayoutControlItem11, Me.LayoutControlItem9, Me.LayoutControlItem5, Me.LayoutControlItem8, Me.LayoutControlItem10}) Me.Root.Name = "Root" - Me.Root.Size = New System.Drawing.Size(800, 363) + Me.Root.Size = New System.Drawing.Size(857, 436) Me.Root.TextVisible = False ' 'LayoutControlItem1 @@ -319,9 +331,9 @@ Partial Class frmAdmin_IDBAttribute 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(780, 40) + Me.LayoutControlItem1.Size = New System.Drawing.Size(837, 40) Me.LayoutControlItem1.Text = "GUID" - Me.LayoutControlItem1.TextSize = New System.Drawing.Size(131, 13) + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(145, 13) ' 'LayoutControlItem2 ' @@ -329,9 +341,9 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 40) 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.Size = New System.Drawing.Size(837, 40) Me.LayoutControlItem2.Text = "Bezeichnung" - Me.LayoutControlItem2.TextSize = New System.Drawing.Size(131, 13) + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(145, 13) ' 'LayoutControlItem4 ' @@ -339,7 +351,7 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 200) Me.LayoutControlItem4.Name = "LayoutControlItem4" Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem4.Size = New System.Drawing.Size(780, 40) + Me.LayoutControlItem4.Size = New System.Drawing.Size(837, 38) Me.LayoutControlItem4.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem4.TextVisible = False ' @@ -349,30 +361,30 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 120) Me.LayoutControlItem6.Name = "LayoutControlItem6" Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem6.Size = New System.Drawing.Size(780, 40) + Me.LayoutControlItem6.Size = New System.Drawing.Size(837, 40) Me.LayoutControlItem6.Text = "Kommentar" - Me.LayoutControlItem6.TextSize = New System.Drawing.Size(131, 13) + Me.LayoutControlItem6.TextSize = New System.Drawing.Size(145, 13) ' 'LayoutControlItem7 ' Me.LayoutControlItem7.Control = Me.txtAddedWho - Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 240) + Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 238) Me.LayoutControlItem7.Name = "LayoutControlItem7" Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem7.Size = New System.Drawing.Size(390, 40) + Me.LayoutControlItem7.Size = New System.Drawing.Size(418, 40) Me.LayoutControlItem7.Text = "Erstellt Wer" - Me.LayoutControlItem7.TextSize = New System.Drawing.Size(131, 13) + Me.LayoutControlItem7.TextSize = New System.Drawing.Size(145, 13) ' 'LayoutControlItem3 ' Me.LayoutControlItem3.Control = Me.SpinEdit1 Me.LayoutControlItem3.CustomizationFormText = "Anzeige Reihenfolge" - Me.LayoutControlItem3.Location = New System.Drawing.Point(390, 160) + Me.LayoutControlItem3.Location = New System.Drawing.Point(418, 160) Me.LayoutControlItem3.Name = "LayoutControlItem3" Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem3.Size = New System.Drawing.Size(390, 40) + Me.LayoutControlItem3.Size = New System.Drawing.Size(419, 40) Me.LayoutControlItem3.Text = "Reihenfolge in Ergebnisliste" - Me.LayoutControlItem3.TextSize = New System.Drawing.Size(131, 13) + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(145, 13) ' 'LayoutControlItem11 ' @@ -380,19 +392,19 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControlItem11.Location = New System.Drawing.Point(0, 80) Me.LayoutControlItem11.Name = "LayoutControlItem11" Me.LayoutControlItem11.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem11.Size = New System.Drawing.Size(780, 40) + Me.LayoutControlItem11.Size = New System.Drawing.Size(837, 40) Me.LayoutControlItem11.Text = "Attribut-Typ" - Me.LayoutControlItem11.TextSize = New System.Drawing.Size(131, 13) + Me.LayoutControlItem11.TextSize = New System.Drawing.Size(145, 13) ' 'LayoutControlItem9 ' Me.LayoutControlItem9.Control = Me.txtChangedWho - Me.LayoutControlItem9.Location = New System.Drawing.Point(0, 280) + Me.LayoutControlItem9.Location = New System.Drawing.Point(0, 278) Me.LayoutControlItem9.Name = "LayoutControlItem9" Me.LayoutControlItem9.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem9.Size = New System.Drawing.Size(390, 63) + Me.LayoutControlItem9.Size = New System.Drawing.Size(418, 138) Me.LayoutControlItem9.Text = "Geändert Wer" - Me.LayoutControlItem9.TextSize = New System.Drawing.Size(131, 13) + Me.LayoutControlItem9.TextSize = New System.Drawing.Size(145, 13) ' 'LayoutControlItem5 ' @@ -400,33 +412,29 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 160) Me.LayoutControlItem5.Name = "LayoutControlItem5" Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem5.Size = New System.Drawing.Size(390, 40) + Me.LayoutControlItem5.Size = New System.Drawing.Size(418, 40) Me.LayoutControlItem5.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem5.TextVisible = False ' 'LayoutControlItem8 ' Me.LayoutControlItem8.Control = Me.txtAddedWhen - Me.LayoutControlItem8.Location = New System.Drawing.Point(390, 240) + Me.LayoutControlItem8.Location = New System.Drawing.Point(418, 238) Me.LayoutControlItem8.Name = "LayoutControlItem8" Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem8.Size = New System.Drawing.Size(390, 40) + Me.LayoutControlItem8.Size = New System.Drawing.Size(419, 40) Me.LayoutControlItem8.Text = "Erstellt Wann" - Me.LayoutControlItem8.TextSize = New System.Drawing.Size(131, 13) + Me.LayoutControlItem8.TextSize = New System.Drawing.Size(145, 13) ' 'LayoutControlItem10 ' Me.LayoutControlItem10.Control = Me.txtChangedWhen - Me.LayoutControlItem10.Location = New System.Drawing.Point(390, 280) + Me.LayoutControlItem10.Location = New System.Drawing.Point(418, 278) Me.LayoutControlItem10.Name = "LayoutControlItem10" Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem10.Size = New System.Drawing.Size(390, 63) + Me.LayoutControlItem10.Size = New System.Drawing.Size(419, 138) Me.LayoutControlItem10.Text = "Geändert Wann" - Me.LayoutControlItem10.TextSize = New System.Drawing.Size(131, 13) - ' - 'TBIDB_ATTRIBUTETableAdapter - ' - Me.TBIDB_ATTRIBUTETableAdapter.ClearBeforeFill = True + Me.LayoutControlItem10.TextSize = New System.Drawing.Size(145, 13) ' 'TableAdapterManager ' @@ -437,11 +445,19 @@ Partial Class frmAdmin_IDBAttribute Me.TableAdapterManager.TBIDB_BUSINESS_ENTITYTableAdapter = Nothing Me.TableAdapterManager.UpdateOrder = DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' + 'VWIDB_BE_ATTRIBUTETableAdapter + ' + Me.VWIDB_BE_ATTRIBUTETableAdapter.ClearBeforeFill = True + ' + 'TBIDB_ATTRIBUTE_TYPETableAdapter + ' + Me.TBIDB_ATTRIBUTE_TYPETableAdapter.ClearBeforeFill = True + ' 'frmAdmin_IDBAttribute ' 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.ClientSize = New System.Drawing.Size(857, 524) Me.Controls.Add(Me.LayoutControl1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) @@ -454,7 +470,7 @@ Partial Class frmAdmin_IDBAttribute CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.LayoutControl1.ResumeLayout(False) CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TBIDB_ATTRIBUTEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.VWIDB_BE_ATTRIBUTEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DSIDB_Stammdaten, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SpinEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() @@ -466,6 +482,7 @@ Partial Class frmAdmin_IDBAttribute CType(Me.txtChangedWho.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtChangedWhen.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TBIDB_ATTRIBUTE_TYPEBindingSource, 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() @@ -498,8 +515,6 @@ Partial Class frmAdmin_IDBAttribute Friend WithEvents SpinEdit1 As DevExpress.XtraEditors.SpinEdit Friend WithEvents LayoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents DSIDB_Stammdaten As DSIDB_Stammdaten - Friend WithEvents TBIDB_ATTRIBUTEBindingSource As BindingSource - Friend WithEvents TBIDB_ATTRIBUTETableAdapter As DSIDB_StammdatenTableAdapters.TBIDB_ATTRIBUTETableAdapter Friend WithEvents TableAdapterManager As DSIDB_StammdatenTableAdapters.TableAdapterManager Friend WithEvents CheckEdit1 As DevExpress.XtraEditors.CheckEdit Friend WithEvents CheckEdit2 As DevExpress.XtraEditors.CheckEdit @@ -515,8 +530,12 @@ Partial Class frmAdmin_IDBAttribute Friend WithEvents LayoutControlItem9 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem8 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem10 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents ComboBoxEdit1 As DevExpress.XtraEditors.ComboBoxEdit Friend WithEvents LayoutControlItem11 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem Friend WithEvents labelStatus As DevExpress.XtraBars.BarStaticItem + Friend WithEvents VWIDB_BE_ATTRIBUTEBindingSource As BindingSource + Friend WithEvents VWIDB_BE_ATTRIBUTETableAdapter As DSIDB_StammdatenTableAdapters.VWIDB_BE_ATTRIBUTETableAdapter + 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 End Class diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.resx b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.resx index 32b787d0..27552a8d 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.resx +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.resx @@ -117,19 +117,22 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 421, 17 + + 438, 21 74, 22 - - 74, 22 - - - 649, 17 + + 263, 56 - 871, 17 + 244, 15 + + + 17, 56 + + + 708, 13 \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb index 291d1d8a..d7a5f62e 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb @@ -4,7 +4,6 @@ Public Class frmAdmin_IDBAttribute Inherits frmAdmin_Base Implements frmAdmin_Interface - Private Property Logger As Logger Implements frmAdmin_Interface.Logger 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 @@ -14,14 +13,14 @@ Public Class frmAdmin_IDBAttribute InitializeComponent() ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. - Logger = My.LogConfig.GetLogger() Me.PrimaryKey = PrimaryKey Me.IsInsert = IsInsert End Sub Private Sub frmAdmin_Attribute_Load(sender As Object, e As EventArgs) Handles MyBase.Load Try - TBIDB_ATTRIBUTETableAdapter.Fill(DSIDB_Stammdaten.TBIDB_ATTRIBUTE, PrimaryKey) + 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) End Try @@ -54,9 +53,9 @@ Public Class frmAdmin_IDBAttribute Public Function SaveData() As Boolean Implements frmAdmin_Interface.SaveData Try - TBIDB_ATTRIBUTEBindingSource.EndEdit() + VWIDB_BE_ATTRIBUTEBindingSource.EndEdit() - If DSIDB_Stammdaten.TBIDB_ATTRIBUTE.GetChanges() IsNot Nothing Then + If DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTE.GetChanges() IsNot Nothing Then HasChanges = True If IsInsert Then @@ -65,8 +64,10 @@ Public Class frmAdmin_IDBAttribute txtChangedWho.EditValue = My.Application.User.UserName End If - TBIDB_ATTRIBUTEBindingSource.EndEdit() - TBIDB_ATTRIBUTETableAdapter.Update(DSIDB_Stammdaten.TBIDB_ATTRIBUTE) + VWIDB_BE_ATTRIBUTEBindingSource.EndEdit() + + ' TODO: Update Database + 'VWIDB_BE_ATTRIBUTETableAdapter.Update(DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTE) End If Return True diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.vb index 83af44d9..c8d7747b 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.vb @@ -4,7 +4,6 @@ Public Class frmAdmin_IDBEntity Inherits frmAdmin_Base Implements frmAdmin_Interface Public Property PrimaryKey As Integer Implements frmAdmin_Interface.PrimaryKey - Public Property Logger As Logger Implements frmAdmin_Interface.Logger Public Property HasChanges As Boolean Implements frmAdmin_Interface.HasChanges Public Property IsInsert As Boolean Implements frmAdmin_Interface.IsInsert diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Interface.vb b/GUIs.ZooFlow/Administration/frmAdmin_Interface.vb index 5f324f39..e37da229 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Interface.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Interface.vb @@ -2,7 +2,6 @@ Public Interface frmAdmin_Interface Property PrimaryKey As Integer - Property Logger As Logger Property HasChanges As Boolean Property IsInsert As Boolean diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb index e6559353..ac547b79 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb @@ -41,6 +41,20 @@ Partial Class frmAdmin_Start Me.BarButtonItem8 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem9 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem10 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem12 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem13 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem14 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem15 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem16 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem17 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem18 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem19 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem20 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem21 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem22 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem23 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem24 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem25 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPage_IDB = New DevExpress.XtraBars.Ribbon.RibbonPage() @@ -49,9 +63,9 @@ Partial Class frmAdmin_Start Me.RibbonGroup_ClipboardWatcher_Profile = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonGroup_ClipboardWatcher_DocSearch = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonGroup_ClipboardWatcher_DataSearch = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonGroup_ClipboardWatcher_Process = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonGroup_ClipboardWatcher_Window = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonGroup_ClipboardWatcher_Control = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonGroup_ClipboardWatcher_Window = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonGroup_ClipboardWatcher_Process = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPage_GlobalIndexer = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() @@ -64,10 +78,8 @@ Partial Class frmAdmin_Start Me.DockPanel1_Container = New DevExpress.XtraBars.Docking.ControlContainer() Me.TBIDB_ATTRIBUTEBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.DSIDB_Stammdaten = New DigitalData.GUIs.ZooFlow.DSIDB_Stammdaten() - Me.TBIDB_ATTRIBUTETableAdapter = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TBIDB_ATTRIBUTETableAdapter() Me.TableAdapterManager = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager() Me.TBIDB_ATTRIBUTE_TYPEBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.TBIDB_ATTRIBUTE_TYPETableAdapter = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TBIDB_ATTRIBUTE_TYPETableAdapter() Me.XtraTabPage_IDB = New DevExpress.XtraTab.XtraTabPage() Me.XtraTabControlIDB = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabPageIDB_Attributes_New = New DevExpress.XtraTab.XtraTabPage() @@ -82,13 +94,32 @@ Partial Class frmAdmin_Start Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabPageCWProfiles = New DevExpress.XtraTab.XtraTabPage() Me.TreeList_CWProfiles = New DevExpress.XtraTreeList.TreeList() - Me.CWImages = New DevExpress.Utils.SvgImageCollection(Me.components) Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage() + Me.CWImages = New DevExpress.Utils.SvgImageCollection(Me.components) Me.XtraTabControl = New DevExpress.XtraTab.XtraTabControl() Me.Panel1 = New System.Windows.Forms.Panel() Me.labelTitle = New System.Windows.Forms.Label() Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() - Me.SvgImageCollection1 = New DevExpress.Utils.SvgImageCollection(Me.components) + Me.ActiveImages = New DevExpress.Utils.SvgImageCollection(Me.components) + Me.TypeImages = New DevExpress.Utils.SvgImageCollection(Me.components) + Me.BarButtonItem11 = New DevExpress.XtraBars.BarButtonItem() + Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup5 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup6 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup7 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup8 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup9 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup10 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup11 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup12 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup13 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup14 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup15 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup16 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup17 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup18 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup19 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TreeListMenu, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MainTreeImages, System.ComponentModel.ISupportInitialize).BeginInit() @@ -118,20 +149,21 @@ Partial Class frmAdmin_Start CType(Me.XtraTabControl, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl.SuspendLayout() Me.Panel1.SuspendLayout() - CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ActiveImages, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TypeImages, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.labelStatus, Me.labelError, Me.BarButtonItemAddAttribute, Me.BarButtonItemRefreshAttribute, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.labelStatus, Me.labelError, Me.BarButtonItemAddAttribute, Me.BarButtonItemRefreshAttribute, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.BarButtonItem12, Me.BarButtonItem13, Me.BarButtonItem14, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.BarButtonItem19, Me.BarButtonItem20, Me.BarButtonItem21, Me.BarButtonItem22, Me.BarButtonItem23, Me.BarButtonItem24, Me.BarButtonItem25}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 16 + Me.RibbonControl1.MaxItemId = 31 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage_IDB, Me.RibbonPage_ClipboardWatcher, Me.RibbonPage_GlobalIndexer}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.ShowToolbarCustomizeItem = False - Me.RibbonControl1.Size = New System.Drawing.Size(1077, 157) + Me.RibbonControl1.Size = New System.Drawing.Size(1077, 159) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 Me.RibbonControl1.Toolbar.ShowCustomizeItem = False ' @@ -236,6 +268,104 @@ Partial Class frmAdmin_Start Me.BarButtonItem10.Name = "BarButtonItem10" Me.BarButtonItem10.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large ' + 'BarButtonItem12 + ' + Me.BarButtonItem12.Caption = "Neue Suche" + Me.BarButtonItem12.Id = 17 + Me.BarButtonItem12.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_addcircled3 + Me.BarButtonItem12.Name = "BarButtonItem12" + ' + 'BarButtonItem13 + ' + Me.BarButtonItem13.Caption = "Neue Suche" + Me.BarButtonItem13.Id = 18 + Me.BarButtonItem13.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_addcircled4 + Me.BarButtonItem13.Name = "BarButtonItem13" + ' + 'BarButtonItem14 + ' + Me.BarButtonItem14.Caption = "Suche löschen" + Me.BarButtonItem14.Id = 19 + Me.BarButtonItem14.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_deletecircled2 + Me.BarButtonItem14.Name = "BarButtonItem14" + ' + 'BarButtonItem15 + ' + Me.BarButtonItem15.Caption = "Suche Löschen" + Me.BarButtonItem15.Id = 20 + Me.BarButtonItem15.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_deletecircled1 + Me.BarButtonItem15.Name = "BarButtonItem15" + ' + 'BarButtonItem16 + ' + Me.BarButtonItem16.Caption = "Zuordnen" + Me.BarButtonItem16.Id = 21 + Me.BarButtonItem16.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.doublenext + Me.BarButtonItem16.Name = "BarButtonItem16" + ' + 'BarButtonItem17 + ' + Me.BarButtonItem17.Caption = "Speichern" + Me.BarButtonItem17.Id = 22 + Me.BarButtonItem17.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.save4 + Me.BarButtonItem17.Name = "BarButtonItem17" + ' + 'BarButtonItem18 + ' + Me.BarButtonItem18.Caption = "Zuordnung löschen" + Me.BarButtonItem18.Id = 23 + Me.BarButtonItem18.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_deletecircled3 + Me.BarButtonItem18.Name = "BarButtonItem18" + ' + 'BarButtonItem19 + ' + Me.BarButtonItem19.Caption = "BarButtonItem19" + Me.BarButtonItem19.Id = 24 + Me.BarButtonItem19.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.definednameuseinformula + Me.BarButtonItem19.Name = "BarButtonItem19" + ' + 'BarButtonItem20 + ' + Me.BarButtonItem20.Caption = "Zuordnung" + Me.BarButtonItem20.Id = 25 + Me.BarButtonItem20.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.doublenext1 + Me.BarButtonItem20.Name = "BarButtonItem20" + ' + 'BarButtonItem21 + ' + Me.BarButtonItem21.Caption = "Speichern" + Me.BarButtonItem21.Id = 26 + Me.BarButtonItem21.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.save5 + Me.BarButtonItem21.Name = "BarButtonItem21" + ' + 'BarButtonItem22 + ' + Me.BarButtonItem22.Caption = "Zuordnung löschen" + Me.BarButtonItem22.Id = 27 + Me.BarButtonItem22.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_deletecircled4 + Me.BarButtonItem22.Name = "BarButtonItem22" + ' + 'BarButtonItem23 + ' + Me.BarButtonItem23.Caption = "BarButtonItem23" + Me.BarButtonItem23.Id = 28 + Me.BarButtonItem23.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.renamedatasource + Me.BarButtonItem23.Name = "BarButtonItem23" + ' + 'BarButtonItem24 + ' + Me.BarButtonItem24.Caption = "Zuordnen" + Me.BarButtonItem24.Id = 29 + Me.BarButtonItem24.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.doublenext2 + Me.BarButtonItem24.Name = "BarButtonItem24" + ' + 'BarButtonItem25 + ' + Me.BarButtonItem25.Caption = "Zuordnung löschen" + Me.BarButtonItem25.Id = 30 + Me.BarButtonItem25.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_deletecircled5 + Me.BarButtonItem25.Name = "BarButtonItem25" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2}) @@ -266,10 +396,9 @@ Partial Class frmAdmin_Start ' 'RibbonPage_ClipboardWatcher ' - Me.RibbonPage_ClipboardWatcher.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonGroup_ClipboardWatcher_Profile, Me.RibbonGroup_ClipboardWatcher_DocSearch, Me.RibbonGroup_ClipboardWatcher_DataSearch, Me.RibbonGroup_ClipboardWatcher_Process, Me.RibbonGroup_ClipboardWatcher_Window, Me.RibbonGroup_ClipboardWatcher_Control}) + Me.RibbonPage_ClipboardWatcher.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonGroup_ClipboardWatcher_Profile, Me.RibbonGroup_ClipboardWatcher_DocSearch, Me.RibbonGroup_ClipboardWatcher_DataSearch, Me.RibbonGroup_ClipboardWatcher_Control, Me.RibbonGroup_ClipboardWatcher_Window, Me.RibbonGroup_ClipboardWatcher_Process}) Me.RibbonPage_ClipboardWatcher.Name = "RibbonPage_ClipboardWatcher" Me.RibbonPage_ClipboardWatcher.Text = "Clipboard Watcher" - Me.RibbonPage_ClipboardWatcher.Visible = False ' 'RibbonGroup_ClipboardWatcher_Profile ' @@ -283,35 +412,48 @@ Partial Class frmAdmin_Start ' 'RibbonGroup_ClipboardWatcher_DocSearch ' + Me.RibbonGroup_ClipboardWatcher_DocSearch.ItemLinks.Add(Me.BarButtonItem12) + Me.RibbonGroup_ClipboardWatcher_DocSearch.ItemLinks.Add(Me.BarButtonItem15) Me.RibbonGroup_ClipboardWatcher_DocSearch.Name = "RibbonGroup_ClipboardWatcher_DocSearch" Me.RibbonGroup_ClipboardWatcher_DocSearch.Text = "Dokument-Suchen" ' 'RibbonGroup_ClipboardWatcher_DataSearch ' + Me.RibbonGroup_ClipboardWatcher_DataSearch.ItemLinks.Add(Me.BarButtonItem13) + Me.RibbonGroup_ClipboardWatcher_DataSearch.ItemLinks.Add(Me.BarButtonItem14) Me.RibbonGroup_ClipboardWatcher_DataSearch.Name = "RibbonGroup_ClipboardWatcher_DataSearch" Me.RibbonGroup_ClipboardWatcher_DataSearch.Text = "Daten-Suchen" ' - 'RibbonGroup_ClipboardWatcher_Process + 'RibbonGroup_ClipboardWatcher_Control ' - Me.RibbonGroup_ClipboardWatcher_Process.Name = "RibbonGroup_ClipboardWatcher_Process" - Me.RibbonGroup_ClipboardWatcher_Process.Text = "Prozess-Zuordnung" + Me.RibbonGroup_ClipboardWatcher_Control.ItemLinks.Add(Me.BarButtonItem24) + Me.RibbonGroup_ClipboardWatcher_Control.ItemLinks.Add(Me.BarButtonItem25) + Me.RibbonGroup_ClipboardWatcher_Control.Name = "RibbonGroup_ClipboardWatcher_Control" + Me.RibbonGroup_ClipboardWatcher_Control.Text = "Feld-Zuordnung" ' 'RibbonGroup_ClipboardWatcher_Window ' + Me.RibbonGroup_ClipboardWatcher_Window.ItemLinks.Add(Me.BarButtonItem20) + Me.RibbonGroup_ClipboardWatcher_Window.ItemLinks.Add(Me.BarButtonItem21) + Me.RibbonGroup_ClipboardWatcher_Window.ItemLinks.Add(Me.BarButtonItem22) + Me.RibbonGroup_ClipboardWatcher_Window.ItemLinks.Add(Me.BarButtonItem23) Me.RibbonGroup_ClipboardWatcher_Window.Name = "RibbonGroup_ClipboardWatcher_Window" Me.RibbonGroup_ClipboardWatcher_Window.Text = "Fenster-Zuordnung" ' - 'RibbonGroup_ClipboardWatcher_Control + 'RibbonGroup_ClipboardWatcher_Process ' - Me.RibbonGroup_ClipboardWatcher_Control.Name = "RibbonGroup_ClipboardWatcher_Control" - Me.RibbonGroup_ClipboardWatcher_Control.Text = "Feld-Zuordnung" + Me.RibbonGroup_ClipboardWatcher_Process.ItemLinks.Add(Me.BarButtonItem16) + Me.RibbonGroup_ClipboardWatcher_Process.ItemLinks.Add(Me.BarButtonItem17) + Me.RibbonGroup_ClipboardWatcher_Process.ItemLinks.Add(Me.BarButtonItem18) + Me.RibbonGroup_ClipboardWatcher_Process.ItemLinks.Add(Me.BarButtonItem19) + Me.RibbonGroup_ClipboardWatcher_Process.Name = "RibbonGroup_ClipboardWatcher_Process" + Me.RibbonGroup_ClipboardWatcher_Process.Text = "Prozess-Zuordnung" ' 'RibbonPage_GlobalIndexer ' Me.RibbonPage_GlobalIndexer.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) Me.RibbonPage_GlobalIndexer.Name = "RibbonPage_GlobalIndexer" Me.RibbonPage_GlobalIndexer.Text = "Global Indexer" - Me.RibbonPage_GlobalIndexer.Visible = False ' 'RibbonPageGroup1 ' @@ -356,7 +498,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, 448) + Me.TreeListMenu.Size = New System.Drawing.Size(193, 446) Me.TreeListMenu.TabIndex = 8 ' 'TreeListColumn1 @@ -387,10 +529,10 @@ 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, 157) + 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, 497) + Me.DockPanel1.Size = New System.Drawing.Size(200, 495) Me.DockPanel1.Text = "Übersicht" ' 'DockPanel1_Container @@ -398,7 +540,7 @@ Partial Class frmAdmin_Start Me.DockPanel1_Container.Controls.Add(Me.TreeListMenu) 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, 448) + Me.DockPanel1_Container.Size = New System.Drawing.Size(193, 446) Me.DockPanel1_Container.TabIndex = 0 ' 'TBIDB_ATTRIBUTEBindingSource @@ -411,10 +553,6 @@ Partial Class frmAdmin_Start Me.DSIDB_Stammdaten.DataSetName = "DSIDB_Stammdaten" Me.DSIDB_Stammdaten.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema ' - 'TBIDB_ATTRIBUTETableAdapter - ' - Me.TBIDB_ATTRIBUTETableAdapter.ClearBeforeFill = True - ' 'TableAdapterManager ' Me.TableAdapterManager.BackupDataSetBeforeUpdate = False @@ -429,15 +567,11 @@ Partial Class frmAdmin_Start Me.TBIDB_ATTRIBUTE_TYPEBindingSource.DataMember = "TBIDB_ATTRIBUTE_TYPE" Me.TBIDB_ATTRIBUTE_TYPEBindingSource.DataSource = Me.DSIDB_Stammdaten ' - 'TBIDB_ATTRIBUTE_TYPETableAdapter - ' - Me.TBIDB_ATTRIBUTE_TYPETableAdapter.ClearBeforeFill = True - ' 'XtraTabPage_IDB ' Me.XtraTabPage_IDB.Controls.Add(Me.XtraTabControlIDB) Me.XtraTabPage_IDB.Name = "XtraTabPage_IDB" - Me.XtraTabPage_IDB.Size = New System.Drawing.Size(875, 428) + Me.XtraTabPage_IDB.Size = New System.Drawing.Size(875, 426) Me.XtraTabPage_IDB.Text = "IDB" ' 'XtraTabControlIDB @@ -446,7 +580,7 @@ Partial Class frmAdmin_Start Me.XtraTabControlIDB.Location = New System.Drawing.Point(0, 0) Me.XtraTabControlIDB.Name = "XtraTabControlIDB" Me.XtraTabControlIDB.SelectedTabPage = Me.XtraTabPageIDB_Attributes_New - Me.XtraTabControlIDB.Size = New System.Drawing.Size(875, 428) + Me.XtraTabControlIDB.Size = New System.Drawing.Size(875, 426) Me.XtraTabControlIDB.TabIndex = 0 Me.XtraTabControlIDB.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPageIDB_Attributes_New, Me.XtraTabPageIDB_Entities}) ' @@ -454,7 +588,7 @@ Partial Class frmAdmin_Start ' Me.XtraTabPageIDB_Attributes_New.Controls.Add(Me.TreeList_IDBAttributes) Me.XtraTabPageIDB_Attributes_New.Name = "XtraTabPageIDB_Attributes_New" - Me.XtraTabPageIDB_Attributes_New.Size = New System.Drawing.Size(873, 405) + Me.XtraTabPageIDB_Attributes_New.Size = New System.Drawing.Size(873, 403) Me.XtraTabPageIDB_Attributes_New.Text = "Attribute" ' 'TreeList_IDBAttributes @@ -463,7 +597,7 @@ Partial Class frmAdmin_Start Me.TreeList_IDBAttributes.Location = New System.Drawing.Point(0, 0) Me.TreeList_IDBAttributes.MenuManager = Me.RibbonControl1 Me.TreeList_IDBAttributes.Name = "TreeList_IDBAttributes" - Me.TreeList_IDBAttributes.Size = New System.Drawing.Size(873, 405) + Me.TreeList_IDBAttributes.Size = New System.Drawing.Size(873, 403) Me.TreeList_IDBAttributes.StateImageList = Me.IDBImages Me.TreeList_IDBAttributes.TabIndex = 0 ' @@ -476,7 +610,7 @@ Partial Class frmAdmin_Start ' Me.XtraTabPageIDB_Entities.Controls.Add(Me.TreeList_IDBEntities) Me.XtraTabPageIDB_Entities.Name = "XtraTabPageIDB_Entities" - Me.XtraTabPageIDB_Entities.Size = New System.Drawing.Size(873, 405) + Me.XtraTabPageIDB_Entities.Size = New System.Drawing.Size(873, 403) Me.XtraTabPageIDB_Entities.Text = "Entitäten" ' 'TreeList_IDBEntities @@ -485,7 +619,7 @@ Partial Class frmAdmin_Start Me.TreeList_IDBEntities.Location = New System.Drawing.Point(0, 0) Me.TreeList_IDBEntities.MenuManager = Me.RibbonControl1 Me.TreeList_IDBEntities.Name = "TreeList_IDBEntities" - Me.TreeList_IDBEntities.Size = New System.Drawing.Size(873, 405) + Me.TreeList_IDBEntities.Size = New System.Drawing.Size(873, 403) Me.TreeList_IDBEntities.StateImageList = Me.IDBImages Me.TreeList_IDBEntities.TabIndex = 0 ' @@ -494,7 +628,7 @@ Partial Class frmAdmin_Start Me.XtraTabPage_GlobalIndexer.Controls.Add(Me.TreeList_GLOBIXProfiles) Me.XtraTabPage_GlobalIndexer.Name = "XtraTabPage_GlobalIndexer" Me.XtraTabPage_GlobalIndexer.PageVisible = False - Me.XtraTabPage_GlobalIndexer.Size = New System.Drawing.Size(875, 428) + Me.XtraTabPage_GlobalIndexer.Size = New System.Drawing.Size(875, 426) Me.XtraTabPage_GlobalIndexer.Text = "Global Indexer" ' 'TreeList_GLOBIXProfiles @@ -504,7 +638,7 @@ Partial Class frmAdmin_Start Me.TreeList_GLOBIXProfiles.MenuManager = Me.RibbonControl1 Me.TreeList_GLOBIXProfiles.Name = "TreeList_GLOBIXProfiles" Me.TreeList_GLOBIXProfiles.PreviewFieldName = "Title" - Me.TreeList_GLOBIXProfiles.Size = New System.Drawing.Size(875, 428) + Me.TreeList_GLOBIXProfiles.Size = New System.Drawing.Size(875, 426) Me.TreeList_GLOBIXProfiles.StateImageList = Me.GLOBIXImages Me.TreeList_GLOBIXProfiles.TabIndex = 0 ' @@ -519,7 +653,7 @@ Partial Class frmAdmin_Start Me.XtraTabPage_ClipboardWatcher.Controls.Add(Me.XtraTabControl1) Me.XtraTabPage_ClipboardWatcher.Name = "XtraTabPage_ClipboardWatcher" Me.XtraTabPage_ClipboardWatcher.PageVisible = False - Me.XtraTabPage_ClipboardWatcher.Size = New System.Drawing.Size(875, 428) + Me.XtraTabPage_ClipboardWatcher.Size = New System.Drawing.Size(875, 426) Me.XtraTabPage_ClipboardWatcher.Text = "Clipboard Watcher" ' 'XtraTabControl1 @@ -528,7 +662,7 @@ Partial Class frmAdmin_Start Me.XtraTabControl1.Location = New System.Drawing.Point(0, 0) Me.XtraTabControl1.Name = "XtraTabControl1" Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPageCWProfiles - Me.XtraTabControl1.Size = New System.Drawing.Size(875, 428) + Me.XtraTabControl1.Size = New System.Drawing.Size(875, 426) Me.XtraTabControl1.TabIndex = 0 Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPageCWProfiles, Me.XtraTabPage2}) ' @@ -536,7 +670,7 @@ Partial Class frmAdmin_Start ' Me.XtraTabPageCWProfiles.Controls.Add(Me.TreeList_CWProfiles) Me.XtraTabPageCWProfiles.Name = "XtraTabPageCWProfiles" - Me.XtraTabPageCWProfiles.Size = New System.Drawing.Size(873, 405) + Me.XtraTabPageCWProfiles.Size = New System.Drawing.Size(873, 403) Me.XtraTabPageCWProfiles.Text = "Profile" ' 'TreeList_CWProfiles @@ -547,30 +681,30 @@ Partial Class frmAdmin_Start Me.TreeList_CWProfiles.MenuManager = Me.RibbonControl1 Me.TreeList_CWProfiles.Name = "TreeList_CWProfiles" Me.TreeList_CWProfiles.ParentFieldName = "" - Me.TreeList_CWProfiles.Size = New System.Drawing.Size(873, 405) + Me.TreeList_CWProfiles.Size = New System.Drawing.Size(873, 403) Me.TreeList_CWProfiles.TabIndex = 2 ' + 'XtraTabPage2 + ' + Me.XtraTabPage2.Name = "XtraTabPage2" + Me.XtraTabPage2.Size = New System.Drawing.Size(873, 403) + Me.XtraTabPage2.Text = "XtraTabPage2" + ' 'CWImages ' Me.CWImages.Add("detailed", "image://svgimages/outlook inspired/detailed.svg") - Me.CWImages.Add("newtablestyle", "image://svgimages/actions/newtablestyle.svg") + Me.CWImages.Add("bo_unknown", "image://svgimages/business objects/bo_unknown.svg") Me.CWImages.Add("bo_appointment", "image://svgimages/business objects/bo_appointment.svg") Me.CWImages.Add("editnames", "image://svgimages/dashboards/editnames.svg") ' - 'XtraTabPage2 - ' - Me.XtraTabPage2.Name = "XtraTabPage2" - Me.XtraTabPage2.Size = New System.Drawing.Size(873, 405) - Me.XtraTabPage2.Text = "XtraTabPage2" - ' 'XtraTabControl ' Me.XtraTabControl.Dock = System.Windows.Forms.DockStyle.Fill - Me.XtraTabControl.Location = New System.Drawing.Point(200, 203) + Me.XtraTabControl.Location = New System.Drawing.Point(200, 205) Me.XtraTabControl.Name = "XtraTabControl" Me.XtraTabControl.SelectedTabPage = Me.XtraTabPage_IDB Me.XtraTabControl.ShowTabHeader = DevExpress.Utils.DefaultBoolean.[True] - Me.XtraTabControl.Size = New System.Drawing.Size(877, 451) + Me.XtraTabControl.Size = New System.Drawing.Size(877, 449) Me.XtraTabControl.TabIndex = 4 Me.XtraTabControl.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage_ClipboardWatcher, Me.XtraTabPage_GlobalIndexer, Me.XtraTabPage_IDB}) ' @@ -578,7 +712,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, 157) + 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 @@ -603,10 +737,179 @@ Partial Class frmAdmin_Start Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonItem2.Name = "BarButtonItem2" ' - 'SvgImageCollection1 + 'ActiveImages + ' + Me.ActiveImages.Add("actions_checkcircled", "image://svgimages/icon builder/actions_checkcircled.svg") + Me.ActiveImages.Add("paymentunpaid", "image://svgimages/outlook inspired/paymentunpaid.svg") + ' + 'TypeImages + ' + Me.TypeImages.Add("detailed", "image://svgimages/outlook inspired/detailed.svg") + Me.TypeImages.Add("bo_unknown", "image://svgimages/business objects/bo_unknown.svg") + Me.TypeImages.Add("bo_appointment", "image://svgimages/business objects/bo_appointment.svg") + Me.TypeImages.Add("editnames", "image://svgimages/dashboards/editnames.svg") + Me.TypeImages.Add("bo_appearance", "image://svgimages/business objects/bo_appearance.svg") + Me.TypeImages.Add("travel_hotel", "image://svgimages/icon builder/travel_hotel.svg") ' - Me.SvgImageCollection1.Add("actions_checkcircled", "image://svgimages/icon builder/actions_checkcircled.svg") - Me.SvgImageCollection1.Add("paymentunpaid", "image://svgimages/outlook inspired/paymentunpaid.svg") + 'BarButtonItem11 + ' + Me.BarButtonItem11.Caption = "Neue Dokumenten Suche" + Me.BarButtonItem11.Id = 16 + Me.BarButtonItem11.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_addcircled2 + Me.BarButtonItem11.Name = "BarButtonItem11" + ' + 'RibbonPageGroup3 + ' + Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem16) + Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem17) + Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem18) + Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem19) + Me.RibbonPageGroup3.Name = "RibbonPageGroup3" + Me.RibbonPageGroup3.Text = "Prozess-Zuordnung" + ' + 'RibbonPageGroup4 + ' + Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem16) + Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem17) + Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem18) + Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem19) + Me.RibbonPageGroup4.Name = "RibbonPageGroup4" + Me.RibbonPageGroup4.Text = "Prozess-Zuordnung" + ' + 'RibbonPageGroup5 + ' + Me.RibbonPageGroup5.ItemLinks.Add(Me.BarButtonItem16) + Me.RibbonPageGroup5.ItemLinks.Add(Me.BarButtonItem17) + Me.RibbonPageGroup5.ItemLinks.Add(Me.BarButtonItem18) + Me.RibbonPageGroup5.ItemLinks.Add(Me.BarButtonItem19) + Me.RibbonPageGroup5.Name = "RibbonPageGroup5" + Me.RibbonPageGroup5.Text = "Prozess-Zuordnung" + ' + 'RibbonPageGroup6 + ' + Me.RibbonPageGroup6.ItemLinks.Add(Me.BarButtonItem16) + Me.RibbonPageGroup6.ItemLinks.Add(Me.BarButtonItem17) + Me.RibbonPageGroup6.ItemLinks.Add(Me.BarButtonItem18) + Me.RibbonPageGroup6.ItemLinks.Add(Me.BarButtonItem19) + Me.RibbonPageGroup6.Name = "RibbonPageGroup6" + Me.RibbonPageGroup6.Text = "Prozess-Zuordnung" + ' + 'RibbonPageGroup7 + ' + Me.RibbonPageGroup7.ItemLinks.Add(Me.BarButtonItem16) + Me.RibbonPageGroup7.ItemLinks.Add(Me.BarButtonItem17) + Me.RibbonPageGroup7.ItemLinks.Add(Me.BarButtonItem18) + Me.RibbonPageGroup7.ItemLinks.Add(Me.BarButtonItem19) + Me.RibbonPageGroup7.Name = "RibbonPageGroup7" + Me.RibbonPageGroup7.Text = "Prozess-Zuordnung" + ' + 'RibbonPageGroup8 + ' + Me.RibbonPageGroup8.ItemLinks.Add(Me.BarButtonItem16) + Me.RibbonPageGroup8.ItemLinks.Add(Me.BarButtonItem17) + Me.RibbonPageGroup8.ItemLinks.Add(Me.BarButtonItem18) + Me.RibbonPageGroup8.ItemLinks.Add(Me.BarButtonItem19) + Me.RibbonPageGroup8.Name = "RibbonPageGroup8" + Me.RibbonPageGroup8.Text = "Prozess-Zuordnung" + ' + 'RibbonPageGroup9 + ' + Me.RibbonPageGroup9.ItemLinks.Add(Me.BarButtonItem16) + Me.RibbonPageGroup9.ItemLinks.Add(Me.BarButtonItem17) + Me.RibbonPageGroup9.ItemLinks.Add(Me.BarButtonItem18) + Me.RibbonPageGroup9.ItemLinks.Add(Me.BarButtonItem19) + Me.RibbonPageGroup9.Name = "RibbonPageGroup9" + Me.RibbonPageGroup9.Text = "Prozess-Zuordnung" + ' + 'RibbonPageGroup10 + ' + Me.RibbonPageGroup10.ItemLinks.Add(Me.BarButtonItem16) + Me.RibbonPageGroup10.ItemLinks.Add(Me.BarButtonItem17) + Me.RibbonPageGroup10.ItemLinks.Add(Me.BarButtonItem18) + Me.RibbonPageGroup10.ItemLinks.Add(Me.BarButtonItem19) + Me.RibbonPageGroup10.Name = "RibbonPageGroup10" + Me.RibbonPageGroup10.Text = "Prozess-Zuordnung" + ' + 'RibbonPageGroup11 + ' + Me.RibbonPageGroup11.ItemLinks.Add(Me.BarButtonItem16) + Me.RibbonPageGroup11.ItemLinks.Add(Me.BarButtonItem17) + Me.RibbonPageGroup11.ItemLinks.Add(Me.BarButtonItem18) + Me.RibbonPageGroup11.ItemLinks.Add(Me.BarButtonItem19) + Me.RibbonPageGroup11.Name = "RibbonPageGroup11" + Me.RibbonPageGroup11.Text = "Prozess-Zuordnung" + ' + 'RibbonPageGroup12 + ' + Me.RibbonPageGroup12.ItemLinks.Add(Me.BarButtonItem16) + Me.RibbonPageGroup12.ItemLinks.Add(Me.BarButtonItem17) + Me.RibbonPageGroup12.ItemLinks.Add(Me.BarButtonItem18) + Me.RibbonPageGroup12.ItemLinks.Add(Me.BarButtonItem19) + Me.RibbonPageGroup12.Name = "RibbonPageGroup12" + Me.RibbonPageGroup12.Text = "Prozess-Zuordnung" + ' + 'RibbonPageGroup13 + ' + Me.RibbonPageGroup13.ItemLinks.Add(Me.BarButtonItem16) + Me.RibbonPageGroup13.ItemLinks.Add(Me.BarButtonItem17) + Me.RibbonPageGroup13.ItemLinks.Add(Me.BarButtonItem18) + Me.RibbonPageGroup13.ItemLinks.Add(Me.BarButtonItem19) + Me.RibbonPageGroup13.Name = "RibbonPageGroup13" + Me.RibbonPageGroup13.Text = "Prozess-Zuordnung" + ' + 'RibbonPageGroup14 + ' + Me.RibbonPageGroup14.ItemLinks.Add(Me.BarButtonItem16) + Me.RibbonPageGroup14.ItemLinks.Add(Me.BarButtonItem17) + Me.RibbonPageGroup14.ItemLinks.Add(Me.BarButtonItem18) + Me.RibbonPageGroup14.ItemLinks.Add(Me.BarButtonItem19) + Me.RibbonPageGroup14.Name = "RibbonPageGroup14" + Me.RibbonPageGroup14.Text = "Prozess-Zuordnung" + ' + 'RibbonPageGroup15 + ' + Me.RibbonPageGroup15.ItemLinks.Add(Me.BarButtonItem16) + Me.RibbonPageGroup15.ItemLinks.Add(Me.BarButtonItem17) + Me.RibbonPageGroup15.ItemLinks.Add(Me.BarButtonItem18) + Me.RibbonPageGroup15.ItemLinks.Add(Me.BarButtonItem19) + Me.RibbonPageGroup15.Name = "RibbonPageGroup15" + Me.RibbonPageGroup15.Text = "Prozess-Zuordnung" + ' + 'RibbonPageGroup16 + ' + Me.RibbonPageGroup16.ItemLinks.Add(Me.BarButtonItem16) + Me.RibbonPageGroup16.ItemLinks.Add(Me.BarButtonItem17) + Me.RibbonPageGroup16.ItemLinks.Add(Me.BarButtonItem18) + Me.RibbonPageGroup16.ItemLinks.Add(Me.BarButtonItem19) + Me.RibbonPageGroup16.Name = "RibbonPageGroup16" + Me.RibbonPageGroup16.Text = "Prozess-Zuordnung" + ' + 'RibbonPageGroup17 + ' + Me.RibbonPageGroup17.ItemLinks.Add(Me.BarButtonItem16) + Me.RibbonPageGroup17.ItemLinks.Add(Me.BarButtonItem17) + Me.RibbonPageGroup17.ItemLinks.Add(Me.BarButtonItem18) + Me.RibbonPageGroup17.ItemLinks.Add(Me.BarButtonItem19) + Me.RibbonPageGroup17.Name = "RibbonPageGroup17" + Me.RibbonPageGroup17.Text = "Prozess-Zuordnung" + ' + 'RibbonPageGroup18 + ' + Me.RibbonPageGroup18.ItemLinks.Add(Me.BarButtonItem16) + Me.RibbonPageGroup18.ItemLinks.Add(Me.BarButtonItem17) + Me.RibbonPageGroup18.ItemLinks.Add(Me.BarButtonItem18) + Me.RibbonPageGroup18.ItemLinks.Add(Me.BarButtonItem19) + Me.RibbonPageGroup18.Name = "RibbonPageGroup18" + Me.RibbonPageGroup18.Text = "Prozess-Zuordnung" + ' + 'RibbonPageGroup19 + ' + Me.RibbonPageGroup19.ItemLinks.Add(Me.BarButtonItem16) + Me.RibbonPageGroup19.ItemLinks.Add(Me.BarButtonItem17) + Me.RibbonPageGroup19.ItemLinks.Add(Me.BarButtonItem18) + Me.RibbonPageGroup19.ItemLinks.Add(Me.BarButtonItem19) + Me.RibbonPageGroup19.Name = "RibbonPageGroup19" + Me.RibbonPageGroup19.Text = "Prozess-Zuordnung" ' 'frmAdmin_Start ' @@ -652,7 +955,8 @@ Partial Class frmAdmin_Start CType(Me.XtraTabControl, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabControl.ResumeLayout(False) Me.Panel1.ResumeLayout(False) - CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ActiveImages, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TypeImages, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -685,13 +989,11 @@ Partial Class frmAdmin_Start Friend WithEvents labelError As DevExpress.XtraBars.BarStaticItem Friend WithEvents TBIDB_ATTRIBUTEBindingSource As BindingSource Friend WithEvents DSIDB_Stammdaten As DSIDB_Stammdaten - Friend WithEvents TBIDB_ATTRIBUTETableAdapter As DSIDB_StammdatenTableAdapters.TBIDB_ATTRIBUTETableAdapter Friend WithEvents TableAdapterManager As DSIDB_StammdatenTableAdapters.TableAdapterManager Friend WithEvents DELETEDCheckBox As CheckBox Friend WithEvents DELETED_WHOTextBox As TextBox Friend WithEvents DELETED_WHENTextBox As TextBox Friend WithEvents TBIDB_ATTRIBUTE_TYPEBindingSource As BindingSource - Friend WithEvents TBIDB_ATTRIBUTE_TYPETableAdapter As DSIDB_StammdatenTableAdapters.TBIDB_ATTRIBUTE_TYPETableAdapter Friend WithEvents BarButtonItemAddAttribute As DevExpress.XtraBars.BarButtonItem Friend WithEvents RibbonPage_IDB As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents RibbonPageGroupAttributes As DevExpress.XtraBars.Ribbon.RibbonPageGroup @@ -722,5 +1024,38 @@ Partial Class frmAdmin_Start Friend WithEvents IDBImages As DevExpress.Utils.SvgImageCollection Friend WithEvents BarButtonItem10 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents SvgImageCollection1 As DevExpress.Utils.SvgImageCollection + Friend WithEvents ActiveImages As DevExpress.Utils.SvgImageCollection + Friend WithEvents TypeImages As DevExpress.Utils.SvgImageCollection + Friend WithEvents BarButtonItem12 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem13 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem14 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem11 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem15 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem16 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem17 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem18 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem19 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem20 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem21 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem22 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem23 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroup5 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroup6 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroup7 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroup8 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroup9 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroup10 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroup11 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroup12 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroup13 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroup14 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroup15 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroup16 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroup17 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroup18 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroup19 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents BarButtonItem24 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem25 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.resx b/GUIs.ZooFlow/Administration/frmAdmin_Start.resx index 7412b67a..1d21c0d3 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.resx +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.resx @@ -258,7 +258,7 @@ 396, 17 - 531, 56 + 273, 45 264, 17 @@ -292,18 +292,12 @@ 531, 17 - - 919, 17 - 1141, 17 17, 56 - - 277, 56 - 17, 17 @@ -323,7 +317,10 @@ IC8+DQo8L3N2Zz4L - - 633, 48 + + 937, 22 + + + 978, 50 \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb index 72cbc288..071a5f8e 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb @@ -185,7 +185,7 @@ Public Class frmAdmin_Start Private Sub Load_Tree(Source As List(Of AdminItem), TreeList As TreeList) ' === ACTIVE COLUMN Dim oActiveEditor As New RepositoryItemImageComboBox With { - .SmallImages = SvgImageCollection1, + .SmallImages = ActiveImages, .GlyphAlignment = HorzAlignment.Center } oActiveEditor.Buttons.Clear() @@ -207,7 +207,7 @@ Public Class frmAdmin_Start ' === TYPE/SCOPE COLUMN Dim oTypeEditor As New RepositoryItemImageComboBox With { - .SmallImages = CWImages, + .SmallImages = TypeImages, .GlyphAlignment = HorzAlignment.Center } oTypeEditor.Buttons.Clear() @@ -215,7 +215,9 @@ Public Class frmAdmin_Start New ImageComboBoxItem("Profil", "PROFILE", 0), New ImageComboBoxItem("Prozess", "PROCESS", 1), New ImageComboBoxItem("Fenster", "WINDOW", 2), - New ImageComboBoxItem("Feld", "CONTROL", 3) + New ImageComboBoxItem("Feld", "CONTROL", 3), + New ImageComboBoxItem("Attribut", "ATTRIBUTE", 4), + New ImageComboBoxItem("Entität", "ENTITY", 5) }) Dim oTypeColumn = New Columns.TreeListColumn() With { .Name = "columnType", diff --git a/GUIs.ZooFlow/Administration/frmGlobix_Dokumentart.vb b/GUIs.ZooFlow/Administration/frmGlobix_Dokumentart.vb index b75cf761..7320dc7c 100644 --- a/GUIs.ZooFlow/Administration/frmGlobix_Dokumentart.vb +++ b/GUIs.ZooFlow/Administration/frmGlobix_Dokumentart.vb @@ -3,8 +3,6 @@ Public Class frmGlobix_Dokumentart Inherits frmAdmin_Base Implements frmAdmin_Interface - - Private Property Logger As Logger Implements frmAdmin_Interface.Logger 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 @@ -57,7 +55,7 @@ Public Class frmGlobix_Dokumentart Try TBDD_DOKUMENTARTBindingSource.EndEdit() - If DSIDB_Stammdaten.TBIDB_ATTRIBUTE.GetChanges() IsNot Nothing Then + If DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTE.GetChanges() IsNot Nothing Then HasChanges = True If IsInsert Then diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb b/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb index 1d0173c1..7d993f48 100644 --- a/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb +++ b/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb @@ -31,6 +31,8 @@ Partial Public Class DSIDB_Stammdaten Private tableTBIDB_ATTRIBUTE_TYPE As TBIDB_ATTRIBUTE_TYPEDataTable + Private tableVWIDB_BE_ATTRIBUTE As VWIDB_BE_ATTRIBUTEDataTable + Private relationFK_TYP_ID As Global.System.Data.DataRelation Private _schemaSerializationMode As Global.System.Data.SchemaSerializationMode = Global.System.Data.SchemaSerializationMode.IncludeSchema @@ -71,6 +73,9 @@ Partial Public Class DSIDB_Stammdaten If (Not (ds.Tables("TBIDB_ATTRIBUTE_TYPE")) Is Nothing) Then MyBase.Tables.Add(New TBIDB_ATTRIBUTE_TYPEDataTable(ds.Tables("TBIDB_ATTRIBUTE_TYPE"))) End If + If (Not (ds.Tables("VWIDB_BE_ATTRIBUTE")) Is Nothing) Then + MyBase.Tables.Add(New VWIDB_BE_ATTRIBUTEDataTable(ds.Tables("VWIDB_BE_ATTRIBUTE"))) + End If Me.DataSetName = ds.DataSetName Me.Prefix = ds.Prefix Me.Namespace = ds.Namespace @@ -118,6 +123,16 @@ Partial Public Class DSIDB_Stammdaten End Get End Property + _ + Public ReadOnly Property VWIDB_BE_ATTRIBUTE() As VWIDB_BE_ATTRIBUTEDataTable + Get + Return Me.tableVWIDB_BE_ATTRIBUTE + End Get + End Property + _ + Private Function ShouldSerializeVWIDB_BE_ATTRIBUTE() As Boolean + Return false + End Function + _ Private Sub SchemaChanged(ByVal sender As Object, ByVal e As Global.System.ComponentModel.CollectionChangeEventArgs) @@ -350,6 +382,9 @@ Partial Public Class DSIDB_Stammdaten _ Public Delegate Sub TBIDB_ATTRIBUTE_TYPERowChangeEventHandler(ByVal sender As Object, ByVal e As TBIDB_ATTRIBUTE_TYPERowChangeEvent) + _ + Public Delegate Sub VWIDB_BE_ATTRIBUTERowChangeEventHandler(ByVal sender As Object, ByVal e As VWIDB_BE_ATTRIBUTERowChangeEvent) + ''' '''Represents the strongly named DataTable class. ''' @@ -1594,280 +1629,741 @@ Partial Public Class DSIDB_Stammdaten End Class ''' - '''Represents strongly named DataRow class. + '''Represents the strongly named DataTable class. ''' - Partial Public Class TBIDB_BUSINESS_ENTITYRow - Inherits Global.System.Data.DataRow + _ + Partial Public Class VWIDB_BE_ATTRIBUTEDataTable + Inherits Global.System.Data.TypedTableBase(Of VWIDB_BE_ATTRIBUTERow) - Private tableTBIDB_BUSINESS_ENTITY As TBIDB_BUSINESS_ENTITYDataTable + Private columnBE_ID As Global.System.Data.DataColumn + + Private columnBE As Global.System.Data.DataColumn + + Private columnATTR_ID As Global.System.Data.DataColumn + + Private columnATTR_TITLE As Global.System.Data.DataColumn + + Private columnTYP_ID As Global.System.Data.DataColumn + + Private columnTYPE_ID As Global.System.Data.DataColumn + + Private columnTYPE_NAME As Global.System.Data.DataColumn + + Private columnVIEW_VISIBLE As Global.System.Data.DataColumn + + Private columnVIEW_SEQUENCE As Global.System.Data.DataColumn + + Private columnLANG_ID As Global.System.Data.DataColumn + + Private columnLANG_CODE As Global.System.Data.DataColumn + + Private columnADDED_WHEN As Global.System.Data.DataColumn + + Private columnADDED_WHO As Global.System.Data.DataColumn + + Private columnCHANGED_WHEN As Global.System.Data.DataColumn + + Private columnCHANGED_WHO As Global.System.Data.DataColumn _ - Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) - MyBase.New(rb) - Me.tableTBIDB_BUSINESS_ENTITY = CType(Me.Table,TBIDB_BUSINESS_ENTITYDataTable) + Public Sub New() + MyBase.New + Me.TableName = "VWIDB_BE_ATTRIBUTE" + Me.BeginInit + Me.InitClass + Me.EndInit End Sub _ - Public Property GUID() As Integer - Get - Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.GUIDColumn),Integer) - End Get - Set - Me(Me.tableTBIDB_BUSINESS_ENTITY.GUIDColumn) = value - End Set - End Property + 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 _ - Public Property PARENT_ENT_ID() As Integer - Get - Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.PARENT_ENT_IDColumn),Integer) - End Get - Set - Me(Me.tableTBIDB_BUSINESS_ENTITY.PARENT_ENT_IDColumn) = value - End Set - End Property + 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 Property TITLE() As String + Public ReadOnly Property BE_IDColumn() As Global.System.Data.DataColumn Get - Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.TITLEColumn),String) + Return Me.columnBE_ID End Get - Set - Me(Me.tableTBIDB_BUSINESS_ENTITY.TITLEColumn) = value - End Set End Property _ - Public Property INHERITS_ATTRIBUTES() As Boolean + Public ReadOnly Property BEColumn() As Global.System.Data.DataColumn Get - Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.INHERITS_ATTRIBUTESColumn),Boolean) + Return Me.columnBE End Get - Set - Me(Me.tableTBIDB_BUSINESS_ENTITY.INHERITS_ATTRIBUTESColumn) = value - End Set End Property _ - Public Property COMMENT() As String + Public ReadOnly Property ATTR_IDColumn() As Global.System.Data.DataColumn Get - Try - Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.COMMENTColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte COMMENT in Tabelle TBIDB_BUSINESS_ENTITY ist DBNull.", e) - End Try + Return Me.columnATTR_ID End Get - Set - Me(Me.tableTBIDB_BUSINESS_ENTITY.COMMENTColumn) = value - End Set End Property _ - Public Property ADDED_WHO() As String + Public ReadOnly Property ATTR_TITLEColumn() As Global.System.Data.DataColumn Get - Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.ADDED_WHOColumn),String) + Return Me.columnATTR_TITLE End Get - Set - Me(Me.tableTBIDB_BUSINESS_ENTITY.ADDED_WHOColumn) = value - End Set End Property _ - Public Property ADDED_WHEN() As Date + Public ReadOnly Property TYP_IDColumn() As Global.System.Data.DataColumn Get - Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.ADDED_WHENColumn),Date) + Return Me.columnTYP_ID End Get - Set - Me(Me.tableTBIDB_BUSINESS_ENTITY.ADDED_WHENColumn) = value - End Set End Property _ - Public Property CHANGED_WHO() As String + Public ReadOnly Property TYPE_IDColumn() As Global.System.Data.DataColumn Get - Try - Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.CHANGED_WHOColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHO in Tabelle TBIDB_BUSINESS_ENTITY ist DBNull.", e) - End Try + Return Me.columnTYPE_ID End Get - Set - Me(Me.tableTBIDB_BUSINESS_ENTITY.CHANGED_WHOColumn) = value - End Set End Property _ - Public Property CHANGED_WHEN() As Date + Public ReadOnly Property TYPE_NAMEColumn() As Global.System.Data.DataColumn Get - Try - Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.CHANGED_WHENColumn),Date) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHEN in Tabelle TBIDB_BUSINESS_ENTITY ist DBNull.", e) - End Try + Return Me.columnTYPE_NAME End Get - Set - Me(Me.tableTBIDB_BUSINESS_ENTITY.CHANGED_WHENColumn) = value - End Set End Property _ - Public Function IsCOMMENTNull() As Boolean - Return Me.IsNull(Me.tableTBIDB_BUSINESS_ENTITY.COMMENTColumn) - End Function - - _ - Public Sub SetCOMMENTNull() - Me(Me.tableTBIDB_BUSINESS_ENTITY.COMMENTColumn) = Global.System.Convert.DBNull - End Sub - - _ - Public Function IsCHANGED_WHONull() As Boolean - Return Me.IsNull(Me.tableTBIDB_BUSINESS_ENTITY.CHANGED_WHOColumn) - End Function - - _ - Public Sub SetCHANGED_WHONull() - Me(Me.tableTBIDB_BUSINESS_ENTITY.CHANGED_WHOColumn) = Global.System.Convert.DBNull - End Sub - - _ - Public Function IsCHANGED_WHENNull() As Boolean - Return Me.IsNull(Me.tableTBIDB_BUSINESS_ENTITY.CHANGED_WHENColumn) - End Function - - _ - Public Sub SetCHANGED_WHENNull() - Me(Me.tableTBIDB_BUSINESS_ENTITY.CHANGED_WHENColumn) = Global.System.Convert.DBNull - End Sub - End Class - - ''' - '''Represents strongly named DataRow class. - ''' - Partial Public Class TBIDB_ATTRIBUTERow - Inherits Global.System.Data.DataRow - - Private tableTBIDB_ATTRIBUTE As TBIDB_ATTRIBUTEDataTable - - _ - Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) - MyBase.New(rb) - Me.tableTBIDB_ATTRIBUTE = CType(Me.Table,TBIDB_ATTRIBUTEDataTable) - End Sub + Public ReadOnly Property VIEW_VISIBLEColumn() As Global.System.Data.DataColumn + Get + Return Me.columnVIEW_VISIBLE + End Get + End Property _ - Public Property GUID() As Integer + Public ReadOnly Property VIEW_SEQUENCEColumn() As Global.System.Data.DataColumn Get - Return CType(Me(Me.tableTBIDB_ATTRIBUTE.GUIDColumn),Integer) + Return Me.columnVIEW_SEQUENCE End Get - Set - Me(Me.tableTBIDB_ATTRIBUTE.GUIDColumn) = value - End Set End Property _ - Public Property TITLE() As String + Public ReadOnly Property LANG_IDColumn() As Global.System.Data.DataColumn Get - Return CType(Me(Me.tableTBIDB_ATTRIBUTE.TITLEColumn),String) + Return Me.columnLANG_ID End Get - Set - Me(Me.tableTBIDB_ATTRIBUTE.TITLEColumn) = value - End Set End Property _ - Public Property TYP_ID() As Byte + Public ReadOnly Property LANG_CODEColumn() As Global.System.Data.DataColumn Get - Return CType(Me(Me.tableTBIDB_ATTRIBUTE.TYP_IDColumn),Byte) + Return Me.columnLANG_CODE End Get - Set - Me(Me.tableTBIDB_ATTRIBUTE.TYP_IDColumn) = value - End Set End Property _ - Public Property MULTI_CONTEXT() As Boolean + Public ReadOnly Property ADDED_WHENColumn() As Global.System.Data.DataColumn Get - Return CType(Me(Me.tableTBIDB_ATTRIBUTE.MULTI_CONTEXTColumn),Boolean) + Return Me.columnADDED_WHEN End Get - Set - Me(Me.tableTBIDB_ATTRIBUTE.MULTI_CONTEXTColumn) = value - End Set End Property _ - Public Property VIEW_SEQUENCE() As Integer + Public ReadOnly Property ADDED_WHOColumn() As Global.System.Data.DataColumn Get - Return CType(Me(Me.tableTBIDB_ATTRIBUTE.VIEW_SEQUENCEColumn),Integer) + Return Me.columnADDED_WHO End Get - Set - Me(Me.tableTBIDB_ATTRIBUTE.VIEW_SEQUENCEColumn) = value - End Set End Property _ - Public Property VIEW_VISIBLE() As Boolean + Public ReadOnly Property CHANGED_WHENColumn() As Global.System.Data.DataColumn Get - Return CType(Me(Me.tableTBIDB_ATTRIBUTE.VIEW_VISIBLEColumn),Boolean) + Return Me.columnCHANGED_WHEN End Get - Set - Me(Me.tableTBIDB_ATTRIBUTE.VIEW_VISIBLEColumn) = value - End Set End Property _ - Public Property COMMENT() As String + Public ReadOnly Property CHANGED_WHOColumn() As Global.System.Data.DataColumn Get - Try - Return CType(Me(Me.tableTBIDB_ATTRIBUTE.COMMENTColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte COMMENT in Tabelle TBIDB_ATTRIBUTE ist DBNull.", e) - End Try + Return Me.columnCHANGED_WHO End Get - Set - Me(Me.tableTBIDB_ATTRIBUTE.COMMENTColumn) = value - End Set End Property _ - Public Property ADDED_WHO() As String + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"), _ + Global.System.ComponentModel.Browsable(false)> _ + Public ReadOnly Property Count() As Integer Get - Return CType(Me(Me.tableTBIDB_ATTRIBUTE.ADDED_WHOColumn),String) + Return Me.Rows.Count End Get - Set - Me(Me.tableTBIDB_ATTRIBUTE.ADDED_WHOColumn) = value - End Set End Property _ - Public Property ADDED_WHEN() As Date + Public Default ReadOnly Property Item(ByVal index As Integer) As VWIDB_BE_ATTRIBUTERow Get - Return CType(Me(Me.tableTBIDB_ATTRIBUTE.ADDED_WHENColumn),Date) + Return CType(Me.Rows(index),VWIDB_BE_ATTRIBUTERow) + End Get + End Property + + _ + Public Event VWIDB_BE_ATTRIBUTERowChanging As VWIDB_BE_ATTRIBUTERowChangeEventHandler + + _ + Public Event VWIDB_BE_ATTRIBUTERowChanged As VWIDB_BE_ATTRIBUTERowChangeEventHandler + + _ + Public Event VWIDB_BE_ATTRIBUTERowDeleting As VWIDB_BE_ATTRIBUTERowChangeEventHandler + + _ + Public Event VWIDB_BE_ATTRIBUTERowDeleted As VWIDB_BE_ATTRIBUTERowChangeEventHandler + + _ + Public Overloads Sub AddVWIDB_BE_ATTRIBUTERow(ByVal row As VWIDB_BE_ATTRIBUTERow) + Me.Rows.Add(row) + End Sub + + _ + Public Overloads Function AddVWIDB_BE_ATTRIBUTERow(ByVal BE_ID As Integer, ByVal BE As String, ByVal ATTR_ID As Integer, ByVal ATTR_TITLE As String, ByVal TYP_ID As Byte, ByVal TYPE_ID As Byte, ByVal TYPE_NAME As String, ByVal VIEW_VISIBLE As Boolean, ByVal VIEW_SEQUENCE As Integer, ByVal LANG_ID As Byte, ByVal LANG_CODE As String, ByVal ADDED_WHEN As Date, ByVal ADDED_WHO As String, ByVal CHANGED_WHEN As Date, ByVal CHANGED_WHO As String) As VWIDB_BE_ATTRIBUTERow + Dim rowVWIDB_BE_ATTRIBUTERow As VWIDB_BE_ATTRIBUTERow = CType(Me.NewRow,VWIDB_BE_ATTRIBUTERow) + Dim columnValuesArray() As Object = New Object() {BE_ID, BE, ATTR_ID, ATTR_TITLE, TYP_ID, TYPE_ID, TYPE_NAME, VIEW_VISIBLE, VIEW_SEQUENCE, LANG_ID, LANG_CODE, ADDED_WHEN, ADDED_WHO, CHANGED_WHEN, CHANGED_WHO} + rowVWIDB_BE_ATTRIBUTERow.ItemArray = columnValuesArray + Me.Rows.Add(rowVWIDB_BE_ATTRIBUTERow) + Return rowVWIDB_BE_ATTRIBUTERow + End Function + + _ + Public Function FindByLANG_ID(ByVal LANG_ID As Byte) As VWIDB_BE_ATTRIBUTERow + Return CType(Me.Rows.Find(New Object() {LANG_ID}),VWIDB_BE_ATTRIBUTERow) + End Function + + _ + Public Overrides Function Clone() As Global.System.Data.DataTable + Dim cln As VWIDB_BE_ATTRIBUTEDataTable = CType(MyBase.Clone,VWIDB_BE_ATTRIBUTEDataTable) + cln.InitVars + Return cln + End Function + + _ + Protected Overrides Function CreateInstance() As Global.System.Data.DataTable + Return New VWIDB_BE_ATTRIBUTEDataTable() + End Function + + _ + Friend Sub InitVars() + Me.columnBE_ID = MyBase.Columns("BE_ID") + Me.columnBE = MyBase.Columns("BE") + Me.columnATTR_ID = MyBase.Columns("ATTR_ID") + Me.columnATTR_TITLE = MyBase.Columns("ATTR_TITLE") + Me.columnTYP_ID = MyBase.Columns("TYP_ID") + Me.columnTYPE_ID = MyBase.Columns("TYPE_ID") + Me.columnTYPE_NAME = MyBase.Columns("TYPE_NAME") + Me.columnVIEW_VISIBLE = MyBase.Columns("VIEW_VISIBLE") + Me.columnVIEW_SEQUENCE = MyBase.Columns("VIEW_SEQUENCE") + Me.columnLANG_ID = MyBase.Columns("LANG_ID") + Me.columnLANG_CODE = MyBase.Columns("LANG_CODE") + Me.columnADDED_WHEN = MyBase.Columns("ADDED_WHEN") + Me.columnADDED_WHO = MyBase.Columns("ADDED_WHO") + Me.columnCHANGED_WHEN = MyBase.Columns("CHANGED_WHEN") + Me.columnCHANGED_WHO = MyBase.Columns("CHANGED_WHO") + End Sub + + _ + Private Sub InitClass() + Me.columnBE_ID = New Global.System.Data.DataColumn("BE_ID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnBE_ID) + Me.columnBE = New Global.System.Data.DataColumn("BE", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnBE) + Me.columnATTR_ID = New Global.System.Data.DataColumn("ATTR_ID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnATTR_ID) + Me.columnATTR_TITLE = New Global.System.Data.DataColumn("ATTR_TITLE", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnATTR_TITLE) + Me.columnTYP_ID = New Global.System.Data.DataColumn("TYP_ID", GetType(Byte), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnTYP_ID) + Me.columnTYPE_ID = New Global.System.Data.DataColumn("TYPE_ID", GetType(Byte), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnTYPE_ID) + Me.columnTYPE_NAME = New Global.System.Data.DataColumn("TYPE_NAME", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnTYPE_NAME) + Me.columnVIEW_VISIBLE = New Global.System.Data.DataColumn("VIEW_VISIBLE", GetType(Boolean), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnVIEW_VISIBLE) + Me.columnVIEW_SEQUENCE = New Global.System.Data.DataColumn("VIEW_SEQUENCE", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnVIEW_SEQUENCE) + Me.columnLANG_ID = New Global.System.Data.DataColumn("LANG_ID", GetType(Byte), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnLANG_ID) + Me.columnLANG_CODE = New Global.System.Data.DataColumn("LANG_CODE", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnLANG_CODE) + 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.columnADDED_WHO = New Global.System.Data.DataColumn("ADDED_WHO", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnADDED_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.columnCHANGED_WHO = New Global.System.Data.DataColumn("CHANGED_WHO", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnCHANGED_WHO) + Me.Constraints.Add(New Global.System.Data.UniqueConstraint("Constraint1", New Global.System.Data.DataColumn() {Me.columnLANG_ID}, true)) + Me.columnBE_ID.AllowDBNull = false + Me.columnBE.AllowDBNull = false + Me.columnBE.MaxLength = 500 + Me.columnATTR_ID.AllowDBNull = false + Me.columnATTR_TITLE.AllowDBNull = false + Me.columnATTR_TITLE.MaxLength = 900 + Me.columnTYP_ID.AllowDBNull = false + Me.columnTYPE_ID.AllowDBNull = false + Me.columnTYPE_NAME.AllowDBNull = false + Me.columnTYPE_NAME.MaxLength = 100 + Me.columnVIEW_VISIBLE.AllowDBNull = false + Me.columnVIEW_SEQUENCE.AllowDBNull = false + Me.columnLANG_ID.AllowDBNull = false + Me.columnLANG_ID.Unique = true + Me.columnLANG_CODE.AllowDBNull = false + Me.columnLANG_CODE.MaxLength = 10 + Me.columnADDED_WHEN.AllowDBNull = false + Me.columnADDED_WHO.AllowDBNull = false + Me.columnADDED_WHO.MaxLength = 30 + Me.columnCHANGED_WHO.MaxLength = 30 + End Sub + + _ + Public Function NewVWIDB_BE_ATTRIBUTERow() As VWIDB_BE_ATTRIBUTERow + Return CType(Me.NewRow,VWIDB_BE_ATTRIBUTERow) + End Function + + _ + Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow + Return New VWIDB_BE_ATTRIBUTERow(builder) + End Function + + _ + Protected Overrides Function GetRowType() As Global.System.Type + Return GetType(VWIDB_BE_ATTRIBUTERow) + End Function + + _ + Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowChanged(e) + If (Not (Me.VWIDB_BE_ATTRIBUTERowChangedEvent) Is Nothing) Then + RaiseEvent VWIDB_BE_ATTRIBUTERowChanged(Me, New VWIDB_BE_ATTRIBUTERowChangeEvent(CType(e.Row,VWIDB_BE_ATTRIBUTERow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowChanging(e) + If (Not (Me.VWIDB_BE_ATTRIBUTERowChangingEvent) Is Nothing) Then + RaiseEvent VWIDB_BE_ATTRIBUTERowChanging(Me, New VWIDB_BE_ATTRIBUTERowChangeEvent(CType(e.Row,VWIDB_BE_ATTRIBUTERow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowDeleted(e) + If (Not (Me.VWIDB_BE_ATTRIBUTERowDeletedEvent) Is Nothing) Then + RaiseEvent VWIDB_BE_ATTRIBUTERowDeleted(Me, New VWIDB_BE_ATTRIBUTERowChangeEvent(CType(e.Row,VWIDB_BE_ATTRIBUTERow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowDeleting(e) + If (Not (Me.VWIDB_BE_ATTRIBUTERowDeletingEvent) Is Nothing) Then + RaiseEvent VWIDB_BE_ATTRIBUTERowDeleting(Me, New VWIDB_BE_ATTRIBUTERowChangeEvent(CType(e.Row,VWIDB_BE_ATTRIBUTERow), e.Action)) + End If + End Sub + + _ + Public Sub RemoveVWIDB_BE_ATTRIBUTERow(ByVal row As VWIDB_BE_ATTRIBUTERow) + Me.Rows.Remove(row) + End Sub + + _ + Public Shared Function GetTypedTableSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType + Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() + Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence() + Dim ds As DSIDB_Stammdaten = New DSIDB_Stammdaten() + Dim any1 As Global.System.Xml.Schema.XmlSchemaAny = New Global.System.Xml.Schema.XmlSchemaAny() + any1.Namespace = "http://www.w3.org/2001/XMLSchema" + any1.MinOccurs = New Decimal(0) + any1.MaxOccurs = Decimal.MaxValue + any1.ProcessContents = Global.System.Xml.Schema.XmlSchemaContentProcessing.Lax + sequence.Items.Add(any1) + Dim any2 As Global.System.Xml.Schema.XmlSchemaAny = New Global.System.Xml.Schema.XmlSchemaAny() + any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1" + any2.MinOccurs = New Decimal(1) + any2.ProcessContents = Global.System.Xml.Schema.XmlSchemaContentProcessing.Lax + sequence.Items.Add(any2) + Dim attribute1 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() + attribute1.Name = "namespace" + attribute1.FixedValue = ds.Namespace + type.Attributes.Add(attribute1) + Dim attribute2 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() + attribute2.Name = "tableTypeName" + attribute2.FixedValue = "VWIDB_BE_ATTRIBUTEDataTable" + 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 TBIDB_BUSINESS_ENTITYRow + Inherits Global.System.Data.DataRow + + Private tableTBIDB_BUSINESS_ENTITY As TBIDB_BUSINESS_ENTITYDataTable + + _ + Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) + MyBase.New(rb) + Me.tableTBIDB_BUSINESS_ENTITY = CType(Me.Table,TBIDB_BUSINESS_ENTITYDataTable) + End Sub + + _ + Public Property GUID() As Integer + Get + Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.GUIDColumn),Integer) + End Get + Set + Me(Me.tableTBIDB_BUSINESS_ENTITY.GUIDColumn) = value + End Set + End Property + + _ + Public Property PARENT_ENT_ID() As Integer + Get + Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.PARENT_ENT_IDColumn),Integer) + End Get + Set + Me(Me.tableTBIDB_BUSINESS_ENTITY.PARENT_ENT_IDColumn) = value + End Set + End Property + + _ + Public Property TITLE() As String + Get + Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.TITLEColumn),String) + End Get + Set + Me(Me.tableTBIDB_BUSINESS_ENTITY.TITLEColumn) = value + End Set + End Property + + _ + Public Property INHERITS_ATTRIBUTES() As Boolean + Get + Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.INHERITS_ATTRIBUTESColumn),Boolean) + End Get + Set + Me(Me.tableTBIDB_BUSINESS_ENTITY.INHERITS_ATTRIBUTESColumn) = value + End Set + End Property + + _ + Public Property COMMENT() As String + Get + Try + Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.COMMENTColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte COMMENT in Tabelle TBIDB_BUSINESS_ENTITY ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBIDB_BUSINESS_ENTITY.COMMENTColumn) = value + End Set + End Property + + _ + Public Property ADDED_WHO() As String + Get + Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.ADDED_WHOColumn),String) + End Get + Set + Me(Me.tableTBIDB_BUSINESS_ENTITY.ADDED_WHOColumn) = value + End Set + End Property + + _ + Public Property ADDED_WHEN() As Date + Get + Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.ADDED_WHENColumn),Date) + End Get + Set + Me(Me.tableTBIDB_BUSINESS_ENTITY.ADDED_WHENColumn) = value + End Set + End Property + + _ + Public Property CHANGED_WHO() As String + Get + Try + Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.CHANGED_WHOColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHO in Tabelle TBIDB_BUSINESS_ENTITY ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBIDB_BUSINESS_ENTITY.CHANGED_WHOColumn) = value + End Set + End Property + + _ + Public Property CHANGED_WHEN() As Date + Get + Try + Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.CHANGED_WHENColumn),Date) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHEN in Tabelle TBIDB_BUSINESS_ENTITY ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBIDB_BUSINESS_ENTITY.CHANGED_WHENColumn) = value + End Set + End Property + + _ + Public Function IsCOMMENTNull() As Boolean + Return Me.IsNull(Me.tableTBIDB_BUSINESS_ENTITY.COMMENTColumn) + End Function + + _ + Public Sub SetCOMMENTNull() + Me(Me.tableTBIDB_BUSINESS_ENTITY.COMMENTColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsCHANGED_WHONull() As Boolean + Return Me.IsNull(Me.tableTBIDB_BUSINESS_ENTITY.CHANGED_WHOColumn) + End Function + + _ + Public Sub SetCHANGED_WHONull() + Me(Me.tableTBIDB_BUSINESS_ENTITY.CHANGED_WHOColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsCHANGED_WHENNull() As Boolean + Return Me.IsNull(Me.tableTBIDB_BUSINESS_ENTITY.CHANGED_WHENColumn) + End Function + + _ + Public Sub SetCHANGED_WHENNull() + Me(Me.tableTBIDB_BUSINESS_ENTITY.CHANGED_WHENColumn) = Global.System.Convert.DBNull + End Sub + End Class + + ''' + '''Represents strongly named DataRow class. + ''' + Partial Public Class TBIDB_ATTRIBUTERow + Inherits Global.System.Data.DataRow + + Private tableTBIDB_ATTRIBUTE As TBIDB_ATTRIBUTEDataTable + + _ + Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) + MyBase.New(rb) + Me.tableTBIDB_ATTRIBUTE = CType(Me.Table,TBIDB_ATTRIBUTEDataTable) + End Sub + + _ + Public Property GUID() As Integer + Get + Return CType(Me(Me.tableTBIDB_ATTRIBUTE.GUIDColumn),Integer) + End Get + Set + Me(Me.tableTBIDB_ATTRIBUTE.GUIDColumn) = value + End Set + End Property + + _ + Public Property TITLE() As String + Get + Return CType(Me(Me.tableTBIDB_ATTRIBUTE.TITLEColumn),String) + End Get + Set + Me(Me.tableTBIDB_ATTRIBUTE.TITLEColumn) = value + End Set + End Property + + _ + Public Property TYP_ID() As Byte + Get + Return CType(Me(Me.tableTBIDB_ATTRIBUTE.TYP_IDColumn),Byte) + End Get + Set + Me(Me.tableTBIDB_ATTRIBUTE.TYP_IDColumn) = value + End Set + End Property + + _ + Public Property MULTI_CONTEXT() As Boolean + Get + Return CType(Me(Me.tableTBIDB_ATTRIBUTE.MULTI_CONTEXTColumn),Boolean) + End Get + Set + Me(Me.tableTBIDB_ATTRIBUTE.MULTI_CONTEXTColumn) = value + End Set + End Property + + _ + Public Property VIEW_SEQUENCE() As Integer + Get + Return CType(Me(Me.tableTBIDB_ATTRIBUTE.VIEW_SEQUENCEColumn),Integer) + End Get + Set + Me(Me.tableTBIDB_ATTRIBUTE.VIEW_SEQUENCEColumn) = value + End Set + End Property + + _ + Public Property VIEW_VISIBLE() As Boolean + Get + Return CType(Me(Me.tableTBIDB_ATTRIBUTE.VIEW_VISIBLEColumn),Boolean) + End Get + Set + Me(Me.tableTBIDB_ATTRIBUTE.VIEW_VISIBLEColumn) = value + End Set + End Property + + _ + Public Property COMMENT() As String + Get + Try + Return CType(Me(Me.tableTBIDB_ATTRIBUTE.COMMENTColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte COMMENT in Tabelle TBIDB_ATTRIBUTE ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBIDB_ATTRIBUTE.COMMENTColumn) = value + End Set + End Property + + _ + Public Property ADDED_WHO() As String + Get + Return CType(Me(Me.tableTBIDB_ATTRIBUTE.ADDED_WHOColumn),String) + End Get + Set + Me(Me.tableTBIDB_ATTRIBUTE.ADDED_WHOColumn) = value + End Set + End Property + + _ + Public Property ADDED_WHEN() As Date + Get + Return CType(Me(Me.tableTBIDB_ATTRIBUTE.ADDED_WHENColumn),Date) End Get Set Me(Me.tableTBIDB_ATTRIBUTE.ADDED_WHENColumn) = value @@ -2239,20 +2735,269 @@ Partial Public Class DSIDB_Stammdaten End Function End Class + ''' + '''Represents strongly named DataRow class. + ''' + Partial Public Class VWIDB_BE_ATTRIBUTERow + Inherits Global.System.Data.DataRow + + Private tableVWIDB_BE_ATTRIBUTE As VWIDB_BE_ATTRIBUTEDataTable + + _ + Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) + MyBase.New(rb) + Me.tableVWIDB_BE_ATTRIBUTE = CType(Me.Table,VWIDB_BE_ATTRIBUTEDataTable) + End Sub + + _ + Public Property BE_ID() As Integer + Get + Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.BE_IDColumn),Integer) + End Get + Set + Me(Me.tableVWIDB_BE_ATTRIBUTE.BE_IDColumn) = value + End Set + End Property + + _ + Public Property BE() As String + Get + Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.BEColumn),String) + End Get + Set + Me(Me.tableVWIDB_BE_ATTRIBUTE.BEColumn) = value + End Set + End Property + + _ + Public Property ATTR_ID() As Integer + Get + Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.ATTR_IDColumn),Integer) + End Get + Set + Me(Me.tableVWIDB_BE_ATTRIBUTE.ATTR_IDColumn) = value + End Set + End Property + + _ + Public Property ATTR_TITLE() As String + Get + Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.ATTR_TITLEColumn),String) + End Get + Set + Me(Me.tableVWIDB_BE_ATTRIBUTE.ATTR_TITLEColumn) = value + End Set + End Property + + _ + Public Property TYP_ID() As Byte + Get + Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.TYP_IDColumn),Byte) + End Get + Set + Me(Me.tableVWIDB_BE_ATTRIBUTE.TYP_IDColumn) = value + End Set + End Property + + _ + Public Property TYPE_ID() As Byte + Get + Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.TYPE_IDColumn),Byte) + End Get + Set + Me(Me.tableVWIDB_BE_ATTRIBUTE.TYPE_IDColumn) = value + End Set + End Property + + _ + Public Property TYPE_NAME() As String + Get + Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.TYPE_NAMEColumn),String) + End Get + Set + Me(Me.tableVWIDB_BE_ATTRIBUTE.TYPE_NAMEColumn) = value + End Set + End Property + + _ + Public Property VIEW_VISIBLE() As Boolean + Get + Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.VIEW_VISIBLEColumn),Boolean) + End Get + Set + Me(Me.tableVWIDB_BE_ATTRIBUTE.VIEW_VISIBLEColumn) = value + End Set + End Property + + _ + Public Property VIEW_SEQUENCE() As Integer + Get + Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.VIEW_SEQUENCEColumn),Integer) + End Get + Set + Me(Me.tableVWIDB_BE_ATTRIBUTE.VIEW_SEQUENCEColumn) = value + End Set + End Property + + _ + Public Property LANG_ID() As Byte + Get + Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.LANG_IDColumn),Byte) + End Get + Set + Me(Me.tableVWIDB_BE_ATTRIBUTE.LANG_IDColumn) = value + End Set + End Property + + _ + Public Property LANG_CODE() As String + Get + Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.LANG_CODEColumn),String) + End Get + Set + Me(Me.tableVWIDB_BE_ATTRIBUTE.LANG_CODEColumn) = value + End Set + End Property + + _ + Public Property ADDED_WHEN() As Date + Get + Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.ADDED_WHENColumn),Date) + End Get + Set + Me(Me.tableVWIDB_BE_ATTRIBUTE.ADDED_WHENColumn) = value + End Set + End Property + + _ + Public Property ADDED_WHO() As String + Get + Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.ADDED_WHOColumn),String) + End Get + Set + Me(Me.tableVWIDB_BE_ATTRIBUTE.ADDED_WHOColumn) = value + End Set + End Property + + _ + Public Property CHANGED_WHEN() As Date + Get + Try + Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.CHANGED_WHENColumn),Date) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHEN in Tabelle VWIDB_BE_ATTRIBUTE ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableVWIDB_BE_ATTRIBUTE.CHANGED_WHENColumn) = value + End Set + End Property + + _ + Public Property CHANGED_WHO() As String + Get + Try + Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.CHANGED_WHOColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHO in Tabelle VWIDB_BE_ATTRIBUTE ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableVWIDB_BE_ATTRIBUTE.CHANGED_WHOColumn) = value + End Set + End Property + + _ + Public Function IsCHANGED_WHENNull() As Boolean + Return Me.IsNull(Me.tableVWIDB_BE_ATTRIBUTE.CHANGED_WHENColumn) + End Function + + _ + Public Sub SetCHANGED_WHENNull() + Me(Me.tableVWIDB_BE_ATTRIBUTE.CHANGED_WHENColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsCHANGED_WHONull() As Boolean + Return Me.IsNull(Me.tableVWIDB_BE_ATTRIBUTE.CHANGED_WHOColumn) + End Function + + _ + Public Sub SetCHANGED_WHONull() + Me(Me.tableVWIDB_BE_ATTRIBUTE.CHANGED_WHOColumn) = Global.System.Convert.DBNull + End Sub + End Class + + ''' + '''Row event argument class + ''' + _ + Public Class TBIDB_BUSINESS_ENTITYRowChangeEvent + Inherits Global.System.EventArgs + + Private eventRow As TBIDB_BUSINESS_ENTITYRow + + Private eventAction As Global.System.Data.DataRowAction + + _ + Public Sub New(ByVal row As TBIDB_BUSINESS_ENTITYRow, ByVal action As Global.System.Data.DataRowAction) + MyBase.New + Me.eventRow = row + Me.eventAction = action + End Sub + + _ + Public ReadOnly Property Row() As TBIDB_BUSINESS_ENTITYRow + 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 TBIDB_BUSINESS_ENTITYRowChangeEvent + Public Class TBIDB_ATTRIBUTERowChangeEvent Inherits Global.System.EventArgs - Private eventRow As TBIDB_BUSINESS_ENTITYRow + Private eventRow As TBIDB_ATTRIBUTERow Private eventAction As Global.System.Data.DataRowAction _ - Public Sub New(ByVal row As TBIDB_BUSINESS_ENTITYRow, ByVal action As Global.System.Data.DataRowAction) + Public Sub New(ByVal row As TBIDB_ATTRIBUTERow, ByVal action As Global.System.Data.DataRowAction) MyBase.New Me.eventRow = row Me.eventAction = action @@ -2260,7 +3005,7 @@ Partial Public Class DSIDB_Stammdaten _ - Public ReadOnly Property Row() As TBIDB_BUSINESS_ENTITYRow + Public ReadOnly Property Row() As TBIDB_ATTRIBUTERow Get Return Me.eventRow End Get @@ -2279,16 +3024,16 @@ Partial Public Class DSIDB_Stammdaten '''Row event argument class ''' _ - Public Class TBIDB_ATTRIBUTERowChangeEvent + Public Class TBIDB_ATTRIBUTE_TYPERowChangeEvent Inherits Global.System.EventArgs - Private eventRow As TBIDB_ATTRIBUTERow + Private eventRow As TBIDB_ATTRIBUTE_TYPERow Private eventAction As Global.System.Data.DataRowAction _ - Public Sub New(ByVal row As TBIDB_ATTRIBUTERow, ByVal action As Global.System.Data.DataRowAction) + Public Sub New(ByVal row As TBIDB_ATTRIBUTE_TYPERow, ByVal action As Global.System.Data.DataRowAction) MyBase.New Me.eventRow = row Me.eventAction = action @@ -2296,7 +3041,7 @@ Partial Public Class DSIDB_Stammdaten _ - Public ReadOnly Property Row() As TBIDB_ATTRIBUTERow + Public ReadOnly Property Row() As TBIDB_ATTRIBUTE_TYPERow Get Return Me.eventRow End Get @@ -2315,16 +3060,16 @@ Partial Public Class DSIDB_Stammdaten '''Row event argument class ''' _ - Public Class TBIDB_ATTRIBUTE_TYPERowChangeEvent + Public Class VWIDB_BE_ATTRIBUTERowChangeEvent Inherits Global.System.EventArgs - Private eventRow As TBIDB_ATTRIBUTE_TYPERow + Private eventRow As VWIDB_BE_ATTRIBUTERow Private eventAction As Global.System.Data.DataRowAction _ - Public Sub New(ByVal row As TBIDB_ATTRIBUTE_TYPERow, ByVal action As Global.System.Data.DataRowAction) + Public Sub New(ByVal row As VWIDB_BE_ATTRIBUTERow, ByVal action As Global.System.Data.DataRowAction) MyBase.New Me.eventRow = row Me.eventAction = action @@ -2332,7 +3077,7 @@ Partial Public Class DSIDB_Stammdaten _ - Public ReadOnly Property Row() As TBIDB_ATTRIBUTE_TYPERow + Public ReadOnly Property Row() As VWIDB_BE_ATTRIBUTERow Get Return Me.eventRow End Get @@ -3474,6 +4219,228 @@ Namespace DSIDB_StammdatenTableAdapters End Function End Class + ''' + '''Represents the connection and commands used to retrieve and save data. + ''' + _ + Partial Public Class VWIDB_BE_ATTRIBUTETableAdapter + Inherits Global.System.ComponentModel.Component + + Private WithEvents _adapter As Global.System.Data.SqlClient.SqlDataAdapter + + Private _connection As Global.System.Data.SqlClient.SqlConnection + + Private _transaction As Global.System.Data.SqlClient.SqlTransaction + + Private _commandCollection() As Global.System.Data.SqlClient.SqlCommand + + Private _clearBeforeFill As Boolean + + _ + Public Sub New() + MyBase.New + Me.ClearBeforeFill = true + End Sub + + _ + Protected Friend ReadOnly Property Adapter() As Global.System.Data.SqlClient.SqlDataAdapter + Get + If (Me._adapter Is Nothing) Then + Me.InitAdapter + End If + Return Me._adapter + End Get + End Property + + _ + Friend Property Connection() As Global.System.Data.SqlClient.SqlConnection + Get + If (Me._connection Is Nothing) Then + Me.InitConnection + End If + Return Me._connection + End Get + Set + Me._connection = value + If (Not (Me.Adapter.InsertCommand) Is Nothing) Then + Me.Adapter.InsertCommand.Connection = value + End If + If (Not (Me.Adapter.DeleteCommand) Is Nothing) Then + Me.Adapter.DeleteCommand.Connection = value + End If + If (Not (Me.Adapter.UpdateCommand) Is Nothing) Then + Me.Adapter.UpdateCommand.Connection = value + End If + Dim i As Integer = 0 + Do While (i < Me.CommandCollection.Length) + If (Not (Me.CommandCollection(i)) Is Nothing) Then + CType(Me.CommandCollection(i),Global.System.Data.SqlClient.SqlCommand).Connection = value + End If + i = (i + 1) + Loop + End Set + End Property + + _ + Friend Property Transaction() As Global.System.Data.SqlClient.SqlTransaction + Get + Return Me._transaction + End Get + Set + Me._transaction = value + Dim i As Integer = 0 + Do While (i < Me.CommandCollection.Length) + Me.CommandCollection(i).Transaction = Me._transaction + i = (i + 1) + Loop + If ((Not (Me.Adapter) Is Nothing) _ + AndAlso (Not (Me.Adapter.DeleteCommand) Is Nothing)) Then + Me.Adapter.DeleteCommand.Transaction = Me._transaction + End If + If ((Not (Me.Adapter) Is Nothing) _ + AndAlso (Not (Me.Adapter.InsertCommand) Is Nothing)) Then + Me.Adapter.InsertCommand.Transaction = Me._transaction + End If + If ((Not (Me.Adapter) Is Nothing) _ + AndAlso (Not (Me.Adapter.UpdateCommand) Is Nothing)) Then + Me.Adapter.UpdateCommand.Transaction = Me._transaction + End If + End Set + End Property + + _ + Protected ReadOnly Property CommandCollection() As Global.System.Data.SqlClient.SqlCommand() + Get + If (Me._commandCollection Is Nothing) Then + Me.InitCommandCollection + End If + Return Me._commandCollection + End Get + End Property + + _ + Public Property ClearBeforeFill() As Boolean + Get + Return Me._clearBeforeFill + End Get + Set + Me._clearBeforeFill = value + End Set + End Property + + _ + Private Sub InitAdapter() + Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() + Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() + tableMapping.SourceTable = "Table" + tableMapping.DataSetTable = "VWIDB_BE_ATTRIBUTE" + tableMapping.ColumnMappings.Add("BE_ID", "BE_ID") + tableMapping.ColumnMappings.Add("BE", "BE") + tableMapping.ColumnMappings.Add("ATTR_ID", "ATTR_ID") + tableMapping.ColumnMappings.Add("ATTR_TITLE", "ATTR_TITLE") + tableMapping.ColumnMappings.Add("TYP_ID", "TYP_ID") + tableMapping.ColumnMappings.Add("TYPE_ID", "TYPE_ID") + tableMapping.ColumnMappings.Add("TYPE_NAME", "TYPE_NAME") + tableMapping.ColumnMappings.Add("VIEW_VISIBLE", "VIEW_VISIBLE") + tableMapping.ColumnMappings.Add("VIEW_SEQUENCE", "VIEW_SEQUENCE") + tableMapping.ColumnMappings.Add("LANG_ID", "LANG_ID") + tableMapping.ColumnMappings.Add("LANG_CODE", "LANG_CODE") + tableMapping.ColumnMappings.Add("ADDED_WHEN", "ADDED_WHEN") + tableMapping.ColumnMappings.Add("ADDED_WHO", "ADDED_WHO") + tableMapping.ColumnMappings.Add("CHANGED_WHEN", "CHANGED_WHEN") + tableMapping.ColumnMappings.Add("CHANGED_WHO", "CHANGED_WHO") + Me._adapter.TableMappings.Add(tableMapping) + End Sub + + _ + Private Sub InitConnection() + Me._connection = New Global.System.Data.SqlClient.SqlConnection() + Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.IDBConnectionStringDEFAULT + End Sub + + _ + Private Sub InitCommandCollection() + Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(1) {} + Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() + Me._commandCollection(0).Connection = Me.Connection + Me._commandCollection(0).CommandText = "SELECT VWIDB_BE_ATTRIBUTE.*"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM VWIDB_BE_ATTRIBUTE" + Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text + Me._commandCollection(1) = New Global.System.Data.SqlClient.SqlCommand() + Me._commandCollection(1).Connection = Me.Connection + Me._commandCollection(1).CommandText = "SELECT VWIDB_BE_ATTRIBUTE.*"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM VWIDB_BE_ATTRIBUTE WHERE ATTR"& _ + "_ID = @ATTRIBUTE_ID AND LANG_ID = @LANGUAGE_ID" + Me._commandCollection(1).CommandType = Global.System.Data.CommandType.Text + Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ATTRIBUTE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "ATTR_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LANGUAGE_ID", Global.System.Data.SqlDbType.TinyInt, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "LANG_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + End Sub + + _ + Public Overloads Overridable Function Fill(ByVal dataTable As DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTEDataTable) As Integer + Me.Adapter.SelectCommand = Me.CommandCollection(0) + If (Me.ClearBeforeFill = true) Then + dataTable.Clear + End If + Dim returnValue As Integer = Me.Adapter.Fill(dataTable) + Return returnValue + End Function + + _ + Public Overloads Overridable Function GetData() As DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTEDataTable + Me.Adapter.SelectCommand = Me.CommandCollection(0) + Dim dataTable As DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTEDataTable = New DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTEDataTable() + Me.Adapter.Fill(dataTable) + Return dataTable + End Function + + _ + Public Overloads Overridable Function FillByAttributeId(ByVal dataTable As DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTEDataTable, ByVal ATTRIBUTE_ID As Integer, ByVal LANGUAGE_ID As Byte) As Integer + Me.Adapter.SelectCommand = Me.CommandCollection(1) + Me.Adapter.SelectCommand.Parameters(0).Value = CType(ATTRIBUTE_ID,Integer) + Me.Adapter.SelectCommand.Parameters(1).Value = CType(LANGUAGE_ID,Byte) + 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 GetDataByAttributeId(ByVal ATTRIBUTE_ID As Integer, ByVal LANGUAGE_ID As Byte) As DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTEDataTable + Me.Adapter.SelectCommand = Me.CommandCollection(1) + Me.Adapter.SelectCommand.Parameters(0).Value = CType(ATTRIBUTE_ID,Integer) + Me.Adapter.SelectCommand.Parameters(1).Value = CType(LANGUAGE_ID,Byte) + Dim dataTable As DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTEDataTable = New DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTEDataTable() + Me.Adapter.Fill(dataTable) + Return dataTable + End Function + End Class + ''' '''TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios ''' @@ -3623,21 +4590,21 @@ Namespace DSIDB_StammdatenTableAdapters allChangedRows.AddRange(updatedRows) End If End If - If (Not (Me._tBIDB_ATTRIBUTETableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBIDB_ATTRIBUTE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + If (Not (Me._tBIDB_BUSINESS_ENTITYTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBIDB_BUSINESS_ENTITY.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._tBIDB_ATTRIBUTETableAdapter.Update(updatedRows)) + result = (result + Me._tBIDB_BUSINESS_ENTITYTableAdapter.Update(updatedRows)) allChangedRows.AddRange(updatedRows) End If End If - If (Not (Me._tBIDB_BUSINESS_ENTITYTableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBIDB_BUSINESS_ENTITY.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + If (Not (Me._tBIDB_ATTRIBUTETableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBIDB_ATTRIBUTE.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._tBIDB_BUSINESS_ENTITYTableAdapter.Update(updatedRows)) + result = (result + Me._tBIDB_ATTRIBUTETableAdapter.Update(updatedRows)) allChangedRows.AddRange(updatedRows) End If End If @@ -3659,19 +4626,19 @@ Namespace DSIDB_StammdatenTableAdapters allAddedRows.AddRange(addedRows) End If End If - If (Not (Me._tBIDB_ATTRIBUTETableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBIDB_ATTRIBUTE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If (Not (Me._tBIDB_BUSINESS_ENTITYTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBIDB_BUSINESS_ENTITY.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBIDB_ATTRIBUTETableAdapter.Update(addedRows)) + result = (result + Me._tBIDB_BUSINESS_ENTITYTableAdapter.Update(addedRows)) allAddedRows.AddRange(addedRows) End If End If - If (Not (Me._tBIDB_BUSINESS_ENTITYTableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBIDB_BUSINESS_ENTITY.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If (Not (Me._tBIDB_ATTRIBUTETableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBIDB_ATTRIBUTE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBIDB_BUSINESS_ENTITYTableAdapter.Update(addedRows)) + result = (result + Me._tBIDB_ATTRIBUTETableAdapter.Update(addedRows)) allAddedRows.AddRange(addedRows) End If End If @@ -3685,19 +4652,19 @@ Namespace DSIDB_StammdatenTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function UpdateDeletedRows(ByVal dataSet As DSIDB_Stammdaten, ByVal allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 - If (Not (Me._tBIDB_BUSINESS_ENTITYTableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBIDB_BUSINESS_ENTITY.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If (Not (Me._tBIDB_ATTRIBUTETableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBIDB_ATTRIBUTE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBIDB_BUSINESS_ENTITYTableAdapter.Update(deletedRows)) + result = (result + Me._tBIDB_ATTRIBUTETableAdapter.Update(deletedRows)) allChangedRows.AddRange(deletedRows) End If End If - If (Not (Me._tBIDB_ATTRIBUTETableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBIDB_ATTRIBUTE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If (Not (Me._tBIDB_BUSINESS_ENTITYTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBIDB_BUSINESS_ENTITY.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBIDB_ATTRIBUTETableAdapter.Update(deletedRows)) + result = (result + Me._tBIDB_BUSINESS_ENTITYTableAdapter.Update(deletedRows)) allChangedRows.AddRange(deletedRows) End If End If diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.xsd b/GUIs.ZooFlow/DSIDB_Stammdaten.xsd index 8d9e6aa7..80a98c8c 100644 --- a/GUIs.ZooFlow/DSIDB_Stammdaten.xsd +++ b/GUIs.ZooFlow/DSIDB_Stammdaten.xsd @@ -238,6 +238,50 @@ SELECT GUID, NAME_TYPE, COMMENT, BIT1, BIT2, BIT3, BIT4, ADDED_WHO, ADDED_WHEN, + + + + + + SELECT VWIDB_BE_ATTRIBUTE.* +FROM VWIDB_BE_ATTRIBUTE + + + + + + + + + + + + + + + + + + + + + + + + + + + SELECT VWIDB_BE_ATTRIBUTE.* +FROM VWIDB_BE_ATTRIBUTE WHERE ATTR_ID = @ATTRIBUTE_ID AND LANG_ID = @LANGUAGE_ID + + + + + + + + + @@ -246,7 +290,7 @@ SELECT GUID, NAME_TYPE, COMMENT, BIT1, BIT2, BIT3, BIT4, ADDED_WHO, ADDED_WHEN, - + @@ -285,7 +329,64 @@ SELECT GUID, NAME_TYPE, COMMENT, BIT1, BIT2, BIT3, BIT4, ADDED_WHO, ADDED_WHEN, - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -342,7 +443,7 @@ SELECT GUID, NAME_TYPE, COMMENT, BIT1, BIT2, BIT3, BIT4, ADDED_WHO, ADDED_WHEN, - + @@ -389,6 +490,10 @@ SELECT GUID, NAME_TYPE, COMMENT, BIT1, BIT2, BIT3, BIT4, ADDED_WHO, ADDED_WHEN, + + + + @@ -400,7 +505,7 @@ SELECT GUID, NAME_TYPE, COMMENT, BIT1, BIT2, BIT3, BIT4, ADDED_WHO, ADDED_WHEN, - + \ No newline at end of file diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.xss b/GUIs.ZooFlow/DSIDB_Stammdaten.xss index 46c14097..a5885506 100644 --- a/GUIs.ZooFlow/DSIDB_Stammdaten.xss +++ b/GUIs.ZooFlow/DSIDB_Stammdaten.xss @@ -6,20 +6,21 @@ --> - + + - + - + 677 - 97 + 95 610 - 97 + 95 diff --git a/GUIs.ZooFlow/My Project/Resources.Designer.vb b/GUIs.ZooFlow/My Project/Resources.Designer.vb index e271af62..cb4c270b 100644 --- a/GUIs.ZooFlow/My Project/Resources.Designer.vb +++ b/GUIs.ZooFlow/My Project/Resources.Designer.vb @@ -250,6 +250,36 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property actions_addcircled2() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("actions_addcircled2", 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_addcircled3() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("actions_addcircled3", 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_addcircled4() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("actions_addcircled4", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -280,6 +310,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property actions_check3() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("actions_check3", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -290,6 +330,56 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property actions_deletecircled1() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("actions_deletecircled1", 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_deletecircled2() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("actions_deletecircled2", 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_deletecircled3() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("actions_deletecircled3", 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_deletecircled4() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("actions_deletecircled4", 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_deletecircled5() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("actions_deletecircled5", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -430,6 +520,46 @@ Namespace My.Resources 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 doublenext() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("doublenext", 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 doublenext1() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("doublenext1", 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 doublenext2() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("doublenext2", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -490,6 +620,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property renamedatasource() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("renamedatasource", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -540,6 +680,36 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property save4() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("save4", 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 save5() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("save5", 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 save6() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("save6", 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 a9077920..5869924d 100644 --- a/GUIs.ZooFlow/My Project/Resources.resx +++ b/GUIs.ZooFlow/My Project/Resources.resx @@ -118,166 +118,217 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\CW_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\save5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\bell_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\StatusAnnotations_Stop_32xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\4_GLOBIX_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ZooflowTitle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ZooFlow-25.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\bo_appointment.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\doublenext2.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\doublenext1.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\save.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\Checked-outforEdit_Color_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\bell_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\save_16xLG.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\definednameuseinformula.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 + + ..\Resources\action_add_16xLG.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\about1.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 + + ..\Resources\bell_go.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\about2.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\StatusAnnotations_Stop_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\highimportance.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\about1.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 - - ..\Resources\ZooflowTitle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_deletecircled3.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\2_ZOO_FLOW_Abo_MouseOver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Editdatasetwithdesigner_8449.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\CW_GEFUNDEN_klein.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\markcomplete.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\save2.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\1_LOGO_ZOO_FLOW1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_check2.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 + + ..\Resources\actions_addcircled3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\2_ZOO_FLOW_Abo_MouseOver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\updatedataextract.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\3_PERSON_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\save1.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 + + ..\Resources\bell_delete.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\save2.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\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\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_deletecircled.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\actions_deletecircled2.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\Checked-outforEdit_Color_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_deletecircled5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\save_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_addcircled2.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\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\DD_Icons_ICO_PMANAGER_256px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ZooFlow-25.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\managedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\Editdatasetwithdesigner_8449.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\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\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 ..\Resources\bo_document.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\save4.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_deletecircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\bo_appointment.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_deletecircled4.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\3_PERSON_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\StatusAnnotations_Stop_32xLG.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\save.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_addcircled.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 ..\Resources\crossdatasourcefiltering.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 + + ..\Resources\save3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\managedatasource.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\updatedataextract.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 - - ..\Resources\markcomplete.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\3_PERSON_INAKTIV_ZOO.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\renamedatasource.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\2_LUPE_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\about2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_addcircled.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\1_LOGO_ZOO_FLOW_DROP2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\about3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\4_GLOBIX_INAKTIV_ZOO.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\save6.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/My Project/licenses.licx b/GUIs.ZooFlow/My Project/licenses.licx index 2475ae0e..2567975b 100644 --- a/GUIs.ZooFlow/My Project/licenses.licx +++ b/GUIs.ZooFlow/My Project/licenses.licx @@ -1,18 +1,19 @@ -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.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.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.FormAssistant, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ButtonEdit, 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.TileControl, 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 -DevExpress.XtraEditors.DateEdit, 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.XtraBars.Docking.DockManager, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.FormAssistant, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TileControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/GUIs.ZooFlow/Resources/actions_addcircled2.svg b/GUIs.ZooFlow/Resources/actions_addcircled2.svg new file mode 100644 index 00000000..0c97b24a --- /dev/null +++ b/GUIs.ZooFlow/Resources/actions_addcircled2.svg @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/actions_addcircled3.svg b/GUIs.ZooFlow/Resources/actions_addcircled3.svg new file mode 100644 index 00000000..0c97b24a --- /dev/null +++ b/GUIs.ZooFlow/Resources/actions_addcircled3.svg @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/actions_addcircled4.svg b/GUIs.ZooFlow/Resources/actions_addcircled4.svg new file mode 100644 index 00000000..0c97b24a --- /dev/null +++ b/GUIs.ZooFlow/Resources/actions_addcircled4.svg @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/actions_check3.svg b/GUIs.ZooFlow/Resources/actions_check3.svg new file mode 100644 index 00000000..35c68028 --- /dev/null +++ b/GUIs.ZooFlow/Resources/actions_check3.svg @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/actions_deletecircled1.svg b/GUIs.ZooFlow/Resources/actions_deletecircled1.svg new file mode 100644 index 00000000..d8c9bb3f --- /dev/null +++ b/GUIs.ZooFlow/Resources/actions_deletecircled1.svg @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/actions_deletecircled2.svg b/GUIs.ZooFlow/Resources/actions_deletecircled2.svg new file mode 100644 index 00000000..d8c9bb3f --- /dev/null +++ b/GUIs.ZooFlow/Resources/actions_deletecircled2.svg @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/actions_deletecircled3.svg b/GUIs.ZooFlow/Resources/actions_deletecircled3.svg new file mode 100644 index 00000000..d8c9bb3f --- /dev/null +++ b/GUIs.ZooFlow/Resources/actions_deletecircled3.svg @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/actions_deletecircled4.svg b/GUIs.ZooFlow/Resources/actions_deletecircled4.svg new file mode 100644 index 00000000..d8c9bb3f --- /dev/null +++ b/GUIs.ZooFlow/Resources/actions_deletecircled4.svg @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/actions_deletecircled5.svg b/GUIs.ZooFlow/Resources/actions_deletecircled5.svg new file mode 100644 index 00000000..d8c9bb3f --- /dev/null +++ b/GUIs.ZooFlow/Resources/actions_deletecircled5.svg @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/definednameuseinformula.svg b/GUIs.ZooFlow/Resources/definednameuseinformula.svg new file mode 100644 index 00000000..0d27a20b --- /dev/null +++ b/GUIs.ZooFlow/Resources/definednameuseinformula.svg @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/doublenext.svg b/GUIs.ZooFlow/Resources/doublenext.svg new file mode 100644 index 00000000..3276e329 --- /dev/null +++ b/GUIs.ZooFlow/Resources/doublenext.svg @@ -0,0 +1,11 @@ + + + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/doublenext1.svg b/GUIs.ZooFlow/Resources/doublenext1.svg new file mode 100644 index 00000000..3276e329 --- /dev/null +++ b/GUIs.ZooFlow/Resources/doublenext1.svg @@ -0,0 +1,11 @@ + + + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/doublenext2.svg b/GUIs.ZooFlow/Resources/doublenext2.svg new file mode 100644 index 00000000..3276e329 --- /dev/null +++ b/GUIs.ZooFlow/Resources/doublenext2.svg @@ -0,0 +1,11 @@ + + + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/renamedatasource.svg b/GUIs.ZooFlow/Resources/renamedatasource.svg new file mode 100644 index 00000000..6e229b9d --- /dev/null +++ b/GUIs.ZooFlow/Resources/renamedatasource.svg @@ -0,0 +1,20 @@ + + + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/save4.svg b/GUIs.ZooFlow/Resources/save4.svg new file mode 100644 index 00000000..fb4f9a13 --- /dev/null +++ b/GUIs.ZooFlow/Resources/save4.svg @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/save5.svg b/GUIs.ZooFlow/Resources/save5.svg new file mode 100644 index 00000000..fb4f9a13 --- /dev/null +++ b/GUIs.ZooFlow/Resources/save5.svg @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/save6.svg b/GUIs.ZooFlow/Resources/save6.svg new file mode 100644 index 00000000..fb4f9a13 --- /dev/null +++ b/GUIs.ZooFlow/Resources/save6.svg @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 325d91b7..266899d7 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -114,6 +114,12 @@ Form + + frmAdmin_CWDataSearch.vb + + + Form + frmAdmin_CWProfile.vb @@ -292,6 +298,9 @@ + + frmAdmin_CWDataSearch.vb + frmAdmin_CWProfile.vb @@ -623,6 +632,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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.GlobalIndexer/My Project/Settings.Designer.vb b/GUIs.GlobalIndexer/My Project/Settings.Designer.vb new file mode 100644 index 00000000..d5a79e89 --- /dev/null +++ b/GUIs.GlobalIndexer/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.GUIs.GlobalIndexer.My.MySettings + Get + Return Global.DigitalData.GUIs.GlobalIndexer.My.MySettings.Default + End Get + End Property + End Module +End Namespace diff --git a/GUIs.GlobalIndexer/My Project/Settings.settings b/GUIs.GlobalIndexer/My Project/Settings.settings new file mode 100644 index 00000000..85b890b3 --- /dev/null +++ b/GUIs.GlobalIndexer/My Project/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + diff --git a/GUIs.GlobalIndexer/packages.config b/GUIs.GlobalIndexer/packages.config new file mode 100644 index 00000000..6f6bc401 --- /dev/null +++ b/GUIs.GlobalIndexer/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file From f5b6e0de27a8e6389847b7530cf2f0196143fdfe Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 18 Mar 2021 13:17:03 +0100 Subject: [PATCH 8/8] Monorepo: Update Dependencies --- .../GUIs.Test.DocumentViewerTest.vbproj | 2 +- GUIs.Test.DocumentViewerTest/packages.config | 2 +- GUIs.Test.EDMIBenchmark/App.config | 8 ++++++++ GUIs.Test.EDMIBenchmark/GUIs.Test.EDMIBenchmark.vbproj | 2 +- GUIs.Test.EDMIBenchmark/packages.config | 2 +- WEBSERVICES/ZUGFeRDRESTService/ZUGFeRDRESTService.csproj | 2 +- 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/GUIs.Test.DocumentViewerTest/GUIs.Test.DocumentViewerTest.vbproj b/GUIs.Test.DocumentViewerTest/GUIs.Test.DocumentViewerTest.vbproj index 627dc581..ae9efa6f 100644 --- a/GUIs.Test.DocumentViewerTest/GUIs.Test.DocumentViewerTest.vbproj +++ b/GUIs.Test.DocumentViewerTest/GUIs.Test.DocumentViewerTest.vbproj @@ -52,7 +52,7 @@ - ..\packages\NLog.4.7.2\lib\net45\NLog.dll + ..\packages\NLog.4.7.5\lib\net45\NLog.dll diff --git a/GUIs.Test.DocumentViewerTest/packages.config b/GUIs.Test.DocumentViewerTest/packages.config index f8dbc83e..6f6bc401 100644 --- a/GUIs.Test.DocumentViewerTest/packages.config +++ b/GUIs.Test.DocumentViewerTest/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/GUIs.Test.EDMIBenchmark/App.config b/GUIs.Test.EDMIBenchmark/App.config index be83dbbe..9465a79c 100644 --- a/GUIs.Test.EDMIBenchmark/App.config +++ b/GUIs.Test.EDMIBenchmark/App.config @@ -48,4 +48,12 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.Test.EDMIBenchmark/GUIs.Test.EDMIBenchmark.vbproj b/GUIs.Test.EDMIBenchmark/GUIs.Test.EDMIBenchmark.vbproj index f8af10ca..52e21353 100644 --- a/GUIs.Test.EDMIBenchmark/GUIs.Test.EDMIBenchmark.vbproj +++ b/GUIs.Test.EDMIBenchmark/GUIs.Test.EDMIBenchmark.vbproj @@ -69,7 +69,7 @@ - ..\packages\NLog.4.7.0\lib\net45\NLog.dll + ..\packages\NLog.4.7.5\lib\net45\NLog.dll diff --git a/GUIs.Test.EDMIBenchmark/packages.config b/GUIs.Test.EDMIBenchmark/packages.config index ef1d1ab0..e305f91b 100644 --- a/GUIs.Test.EDMIBenchmark/packages.config +++ b/GUIs.Test.EDMIBenchmark/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/WEBSERVICES/ZUGFeRDRESTService/ZUGFeRDRESTService.csproj b/WEBSERVICES/ZUGFeRDRESTService/ZUGFeRDRESTService.csproj index fafc3f02..407bca0b 100644 --- a/WEBSERVICES/ZUGFeRDRESTService/ZUGFeRDRESTService.csproj +++ b/WEBSERVICES/ZUGFeRDRESTService/ZUGFeRDRESTService.csproj @@ -11,7 +11,7 @@ - +