From 9298714903537d9ac62224f81a032b791fa6bdd1 Mon Sep 17 00:00:00 2001 From: SchreiberM Date: Thu, 28 Apr 2016 16:50:01 +0200 Subject: [PATCH 1/3] MS_28.04 --- .../frmConstructor_Main.Designer.vb | 131 +++++++- .../frmConstructor_Main.resx | 305 ++++++++++++++++-- .../frmConstructor_Main.vb | 5 +- 3 files changed, 397 insertions(+), 44 deletions(-) diff --git a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb index f688ce4..3294fd6 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb @@ -22,7 +22,6 @@ Partial Class frmConstructor_Main 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() - Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConstructor_Main)) Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() Dim GridLevelNode2 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() @@ -30,12 +29,12 @@ Partial Class frmConstructor_Main Me.SplitContainerMain = New DevExpress.XtraEditors.SplitContainerControl() Me.SplitContainerTop = New DevExpress.XtraEditors.SplitContainerControl() Me.TreeViewMain = New System.Windows.Forms.TreeView() - Me.CMSEntity = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.CMSEntity = New System.Windows.Forms.ContextMenuStrip() Me.ResetEbenenAuswahlToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DateiimportEntitätToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.FormDesignerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.GridControlMain = New DevExpress.XtraGrid.GridControl() - Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip() Me.FunktionenDataGridToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() Me.AnsichtUmschaltenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -59,7 +58,7 @@ Partial Class frmConstructor_Main Me.pnlDetails = New System.Windows.Forms.Panel() Me.TabWindream = New DevExpress.XtraTab.XtraTabPage() Me.GridControlDocSearch = New DevExpress.XtraGrid.GridControl() - Me.ContextMenuStripResultFiles = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.ContextMenuStripResultFiles = New System.Windows.Forms.ContextMenuStrip() Me.DateiÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator7 = New System.Windows.Forms.ToolStripSeparator() Me.CopyToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -94,7 +93,7 @@ Partial Class frmConstructor_Main Me.Panel1 = New System.Windows.Forms.Panel() Me.GridControlPos = New DevExpress.XtraGrid.GridControl() Me.grvwGridPos = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.BindingNavigatorPOS = New System.Windows.Forms.BindingNavigator(Me.components) + Me.BindingNavigatorPOS = New System.Windows.Forms.BindingNavigator() Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel() Me.BindingNavigatorDeleteItem = New System.Windows.Forms.ToolStripButton() @@ -136,20 +135,32 @@ Partial Class frmConstructor_Main Me.tsslblStatus = New System.Windows.Forms.ToolStripStatusLabel() Me.tsslblRecord = New System.Windows.Forms.ToolStripStatusLabel() Me.tsslblWorkflowstate = New System.Windows.Forms.ToolStripStatusLabel() - Me.BindingSource_Entity = New System.Windows.Forms.BindingSource(Me.components) + Me.BindingSource_Entity = New System.Windows.Forms.BindingSource() Me.DD_ECMAdmin = New DD_Record_Organiser.DD_ECMAdmin() - Me.ImageCollection1 = New DevExpress.Utils.ImageCollection(Me.components) - Me.ttToolTip = New System.Windows.Forms.ToolTip(Me.components) - Me.ContextMenuDetails = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.ImageCollection1 = New DevExpress.Utils.ImageCollection() + Me.ttToolTip = New System.Windows.Forms.ToolTip() + Me.ContextMenuDetails = New System.Windows.Forms.ContextMenuStrip() Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet() - Me.VWPMO_WF_USER_ACTIVEBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.VWPMO_WF_USER_ACTIVEBindingSource = New System.Windows.Forms.BindingSource() Me.VWPMO_WF_USER_ACTIVETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter() Me.TableAdapterManager = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager() Me.TBPMO_FILES_USERTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_FILES_USERTableAdapter() - Me.VWPMO_WF_ACTIVEBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.VWPMO_WF_ACTIVEBindingSource = New System.Windows.Forms.BindingSource() Me.VWPMO_WF_ACTIVETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter() - Me.TBPMO_FILES_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.ToolTipController = New DevExpress.Utils.ToolTipController(Me.components) + Me.TBPMO_FILES_USERBindingSource = New System.Windows.Forms.BindingSource() + Me.ToolTipController = New DevExpress.Utils.ToolTipController() + Me.BindingNavigator1 = New System.Windows.Forms.BindingNavigator() + Me.BindingNavigatorMoveFirstItem1 = New System.Windows.Forms.ToolStripButton() + Me.BindingNavigatorMovePreviousItem1 = New System.Windows.Forms.ToolStripButton() + Me.BindingNavigatorSeparator3 = New System.Windows.Forms.ToolStripSeparator() + Me.BindingNavigatorPositionItem1 = New System.Windows.Forms.ToolStripTextBox() + Me.BindingNavigatorCountItem1 = New System.Windows.Forms.ToolStripLabel() + Me.BindingNavigatorSeparator4 = New System.Windows.Forms.ToolStripSeparator() + Me.BindingNavigatorMoveNextItem1 = New System.Windows.Forms.ToolStripButton() + Me.BindingNavigatorMoveLastItem1 = New System.Windows.Forms.ToolStripButton() + Me.BindingNavigatorSeparator5 = New System.Windows.Forms.ToolStripSeparator() + Me.BindingNavigatorAddNewItem1 = New System.Windows.Forms.ToolStripButton() + Me.BindingNavigatorDeleteItem1 = New System.Windows.Forms.ToolStripButton() CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerMain.SuspendLayout() CType(Me.SplitContainerTop, System.ComponentModel.ISupportInitialize).BeginInit() @@ -192,6 +203,8 @@ Partial Class frmConstructor_Main CType(Me.VWPMO_WF_USER_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.VWPMO_WF_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPMO_FILES_USERBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.BindingNavigator1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.BindingNavigator1.SuspendLayout() Me.SuspendLayout() ' 'SplitContainerMain @@ -212,6 +225,7 @@ Partial Class frmConstructor_Main Me.SplitContainerTop.Name = "SplitContainerTop" Me.SplitContainerTop.Panel1.Controls.Add(Me.TreeViewMain) resources.ApplyResources(Me.SplitContainerTop.Panel1, "SplitContainerTop.Panel1") + Me.SplitContainerTop.Panel2.Controls.Add(Me.BindingNavigator1) Me.SplitContainerTop.Panel2.Controls.Add(Me.GridControlMain) resources.ApplyResources(Me.SplitContainerTop.Panel2, "SplitContainerTop.Panel2") Me.SplitContainerTop.SplitterPosition = 283 @@ -1044,6 +1058,82 @@ Partial Class frmConstructor_Main Me.TBPMO_FILES_USERBindingSource.DataMember = "TBPMO_FILES_USER" Me.TBPMO_FILES_USERBindingSource.DataSource = Me.DD_DMSDataSet ' + 'BindingNavigator1 + ' + Me.BindingNavigator1.AddNewItem = Me.BindingNavigatorAddNewItem1 + Me.BindingNavigator1.BindingSource = Me.BindingSource_Entity + Me.BindingNavigator1.CountItem = Me.BindingNavigatorCountItem1 + Me.BindingNavigator1.DeleteItem = Me.BindingNavigatorDeleteItem1 + resources.ApplyResources(Me.BindingNavigator1, "BindingNavigator1") + Me.BindingNavigator1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem1, Me.BindingNavigatorMovePreviousItem1, Me.BindingNavigatorSeparator3, Me.BindingNavigatorPositionItem1, Me.BindingNavigatorCountItem1, Me.BindingNavigatorSeparator4, Me.BindingNavigatorMoveNextItem1, Me.BindingNavigatorMoveLastItem1, Me.BindingNavigatorSeparator5, Me.BindingNavigatorAddNewItem1, Me.BindingNavigatorDeleteItem1}) + Me.BindingNavigator1.MoveFirstItem = Me.BindingNavigatorMoveFirstItem1 + Me.BindingNavigator1.MoveLastItem = Me.BindingNavigatorMoveLastItem1 + Me.BindingNavigator1.MoveNextItem = Me.BindingNavigatorMoveNextItem1 + Me.BindingNavigator1.MovePreviousItem = Me.BindingNavigatorMovePreviousItem1 + Me.BindingNavigator1.Name = "BindingNavigator1" + Me.BindingNavigator1.PositionItem = Me.BindingNavigatorPositionItem1 + ' + 'BindingNavigatorMoveFirstItem1 + ' + Me.BindingNavigatorMoveFirstItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + resources.ApplyResources(Me.BindingNavigatorMoveFirstItem1, "BindingNavigatorMoveFirstItem1") + Me.BindingNavigatorMoveFirstItem1.Name = "BindingNavigatorMoveFirstItem" + ' + 'BindingNavigatorMovePreviousItem1 + ' + Me.BindingNavigatorMovePreviousItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + resources.ApplyResources(Me.BindingNavigatorMovePreviousItem1, "BindingNavigatorMovePreviousItem1") + Me.BindingNavigatorMovePreviousItem1.Name = "BindingNavigatorMovePreviousItem" + ' + 'BindingNavigatorSeparator3 + ' + Me.BindingNavigatorSeparator3.Name = "BindingNavigatorSeparator" + resources.ApplyResources(Me.BindingNavigatorSeparator3, "BindingNavigatorSeparator3") + ' + 'BindingNavigatorPositionItem1 + ' + resources.ApplyResources(Me.BindingNavigatorPositionItem1, "BindingNavigatorPositionItem1") + Me.BindingNavigatorPositionItem1.Name = "BindingNavigatorPositionItem" + ' + 'BindingNavigatorCountItem1 + ' + Me.BindingNavigatorCountItem1.Name = "BindingNavigatorCountItem" + resources.ApplyResources(Me.BindingNavigatorCountItem1, "BindingNavigatorCountItem1") + ' + 'BindingNavigatorSeparator4 + ' + Me.BindingNavigatorSeparator4.Name = "BindingNavigatorSeparator" + resources.ApplyResources(Me.BindingNavigatorSeparator4, "BindingNavigatorSeparator4") + ' + 'BindingNavigatorMoveNextItem1 + ' + Me.BindingNavigatorMoveNextItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + resources.ApplyResources(Me.BindingNavigatorMoveNextItem1, "BindingNavigatorMoveNextItem1") + Me.BindingNavigatorMoveNextItem1.Name = "BindingNavigatorMoveNextItem" + ' + 'BindingNavigatorMoveLastItem1 + ' + Me.BindingNavigatorMoveLastItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + resources.ApplyResources(Me.BindingNavigatorMoveLastItem1, "BindingNavigatorMoveLastItem1") + Me.BindingNavigatorMoveLastItem1.Name = "BindingNavigatorMoveLastItem" + ' + 'BindingNavigatorSeparator5 + ' + Me.BindingNavigatorSeparator5.Name = "BindingNavigatorSeparator" + resources.ApplyResources(Me.BindingNavigatorSeparator5, "BindingNavigatorSeparator5") + ' + 'BindingNavigatorAddNewItem1 + ' + Me.BindingNavigatorAddNewItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + resources.ApplyResources(Me.BindingNavigatorAddNewItem1, "BindingNavigatorAddNewItem1") + Me.BindingNavigatorAddNewItem1.Name = "BindingNavigatorAddNewItem" + ' + 'BindingNavigatorDeleteItem1 + ' + Me.BindingNavigatorDeleteItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + resources.ApplyResources(Me.BindingNavigatorDeleteItem1, "BindingNavigatorDeleteItem1") + Me.BindingNavigatorDeleteItem1.Name = "BindingNavigatorDeleteItem" + ' 'frmConstructor_Main ' resources.ApplyResources(Me, "$this") @@ -1103,6 +1193,9 @@ Partial Class frmConstructor_Main CType(Me.VWPMO_WF_USER_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.VWPMO_WF_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBPMO_FILES_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.BindingNavigator1, System.ComponentModel.ISupportInitialize).EndInit() + Me.BindingNavigator1.ResumeLayout(False) + Me.BindingNavigator1.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -1230,4 +1323,16 @@ Partial Class frmConstructor_Main Friend WithEvents DeleteToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents ToolStripSeparator9 As System.Windows.Forms.ToolStripSeparator Friend WithEvents PropertiesToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents BindingNavigator1 As System.Windows.Forms.BindingNavigator + Friend WithEvents BindingNavigatorAddNewItem1 As System.Windows.Forms.ToolStripButton + Friend WithEvents BindingNavigatorCountItem1 As System.Windows.Forms.ToolStripLabel + Friend WithEvents BindingNavigatorDeleteItem1 As System.Windows.Forms.ToolStripButton + Friend WithEvents BindingNavigatorMoveFirstItem1 As System.Windows.Forms.ToolStripButton + Friend WithEvents BindingNavigatorMovePreviousItem1 As System.Windows.Forms.ToolStripButton + Friend WithEvents BindingNavigatorSeparator3 As System.Windows.Forms.ToolStripSeparator + Friend WithEvents BindingNavigatorPositionItem1 As System.Windows.Forms.ToolStripTextBox + Friend WithEvents BindingNavigatorSeparator4 As System.Windows.Forms.ToolStripSeparator + Friend WithEvents BindingNavigatorMoveNextItem1 As System.Windows.Forms.ToolStripButton + Friend WithEvents BindingNavigatorMoveLastItem1 As System.Windows.Forms.ToolStripButton + Friend WithEvents BindingNavigatorSeparator5 As System.Windows.Forms.ToolStripSeparator End Class diff --git a/app/DD-Record-Organiser/frmConstructor_Main.resx b/app/DD-Record-Organiser/frmConstructor_Main.resx index 6e86919..e388d74 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.resx +++ b/app/DD-Record-Organiser/frmConstructor_Main.resx @@ -132,7 +132,7 @@ 0, 0 - 1693, 54 + 17, 128 194, 22 @@ -192,8 +192,192 @@ Panel1 + + 502, 128 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFKSURBVDhPYxi84O4C9v+35nH+vzqH6//FGbz/ocLEg+tA + jX8eNf7/87Dh/8nJAqQbcH46L9yAgz0ipBtwfJIgUHPd/z8Pqv7vaBcnbMClmTz/z07l+38SqPFIv9D/ + fd0iQM3l///eK/q/vkHm/6oauf9LKxX/zy9V/j+rSBXTwFNAf/55WA/UVAvElf//3CsB4rz/f+9m/v97 + J/n/39tx///djADikP+TcjQxDTjUKwx27t/7pUCNBUCN2UCNqUCNCf//3YoGagz7/+9G0P9/1/3+d6Xp + Yhqws13i/5Zmqf/rwM6V/7+kQvH/31sxQI3h/6fmafyfkKX1vztD9397qv7/5kRDwmEyG+hPkHP/3Qj4 + 35OhQ1gDOgD5898NfyD2+9+arE+6Ad3pumD/gnB9nBHpBrQkGfxviDf8XxNr/L8y2oR0A+gEGBgAJCPY + nnX8iGkAAAAASUVORK5CYII= + + + + True + + + 23, 22 + + + Neu hinzufügen + + + 162, 11 + + + 44, 22 + + + von {0} + + + Die Gesamtanzahl der Elemente. + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFvSURBVDhPtZBNKMNhHMd3Vd5K7eKCWjkgk7yEZDKksciE + yMwkBw6LhHZxcCDlQg64SA4kJeVE4jRv89qaWn8tUtoF/7g8H2Ootb+x4nt56nm+38/v+/xUfyJcJ9Bt + BMcOH1eRiZV5RGcVwqyHrfWwELweWJoJ9rC2AL0mRLse0VEBcxOKkLeGwlwGIz2h75w6ApC6bERjAdia + gkxiyIow5cKkPWxDFYvTiMrUdxDDVnCfwVh/AOo/P2zhhccFzcWBLxmzEPV50Nfyu/Cn2N/1V85DGNKh + Rhth+EaCxkLISUDWxvOgjYXa7F/Wv7kGUz4UJeKzGODi6H25d2l+yPLsDwu8v4NWHY8lSbhL0/HtbX8F + GLXh1MQgnxwoQ3h5hkEL6JI5TlPj21gNMd6WZyC1VSN7r0Mh7G4i56pxpkQhdTWA/KQ4aUcTh+x0KACm + RpBSo3HrM0G6Uq7pl2zvhvNDBcClE8YH4HDv2/A/SKV6BYojAxyEJtLJAAAAAElFTkSuQmCC + + + + True + + + 23, 22 + + + Löschen + + + None + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEqSURBVDhPYxg8oHDW8/9NC57/z5z4+D9UCAOEtz/AKceQ + O/PZ/1VH3v/HpSi++8H/4IZruA3ImPL0/8J9H7Aqiu95+H/p/v///asv4DYgoefJ/2lb3mMoimi/D9ac + Oev/f6/SE7gNiOx69L939QcURaGt98CaW9cBbe/8+98l/wBuAwKbH/6vm/8Orii45e7/RXv//+8Aas6Y + 8/O/Xd3P//YZ23Eb4FF1/3/+tDcoiuyKb/9Pn/P7v3/Xt/86he/+WySsx22Afend/9mTX2Mo0k85/9+k + 6MV/laxP/40jl+E2wCLvzv/U/tdYFRkknfgvm/b1v27wPNwGGGbd/h/W8hKnIv3Uy/81fKfhNkAn7cZ/ + v+qHeBWpeEzAbYBT7pX/IAV4FQ1CwMAAAPB2wKul5ZpwAAAAAElFTkSuQmCC + + + + True + + + 23, 22 + + + Erste verschieben + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAC2SURBVDhPYxg6ILz9wX8ok3QQ3/3gf3DDNfIMiO95+H/p + /v///asvkG5ARPt9sObMWf//e5WeIM2A0NZ7YM2t64C2d/7975J/gHgDglvu/l+09///DqDmjDk//9vV + /fxvn7GdNBfYFd/+nz7n93//rm//dQrf/bdIWE96GOinnP9vUvTiv0rWp//GkctINwAEDJJO/JdN+/pf + N3geeQaAgH7q5f8avtPINwAEVDwmUGbAYAUMDADQFGCYBLpQVQAAAABJRU5ErkJggg== + + + + True + + + 23, 22 + + + Vorherige verschieben + + + 6, 25 + + + Position + + + False + + + 50, 23 + + + 0 + + + Aktuelle Position + + + 6, 25 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACjSURBVDhPYxh8oHDW8/9QJnkgd+az/wnd98g3JGPK0//z + 9v/+n9B1hzxDEnqe/J+979f/zq1//7uVXibdkMiuR/+nbPv1v2Tp3/8J0//+t8k9S5ohgc0P/7eufQ/W + bFzy5b909LX/xpHLiDfEo+r+/5K57+CaFV16SHOBfend/4Etz8jTDAIWeXf+2xRcIU8zCBhm3SZfMwjo + pN0gX/NQBAwMAKB+X6AHNEI4AAAAAElFTkSuQmCC + + + + True + + + 23, 22 + + + Nächste verschieben + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEsSURBVDhPYxhcoHDW8/9QJgYAyTUteP4/c+JjnGoYcmc+ + +5/QfQ+rApDcqiPv/4e3P8BtQMaUp//n7f/9P6HrDoYikNzCfR/+Bzdcw21AQs+T/7P3/frfufXvf7fS + yygKQXLTtrz/7199AbcBkV2P/k/Z9ut/ydK//xOm//1vk3sWrhgk17v6w3+v0hO4DQhsfvi/de17sGbj + ki//paOv/TeOXAbWAJKrm//uv0v+AdwGeFTd/18y9x1cs6JLD1wxSC5/2pv/9hnbcRtgX3r3f2DLMwzN + IACSy578+r9FwnrcBljk3flvU3AFQzMIgORS+1/DvYQVGGbdxqoZBEByYS0v/+sGz8NtgE7aDZySIDm/ + 6of/NXyn4TYAH3DKvfJfxWMCGEOFBgVgYAAAvtG/s7kMTpwAAAAASUVORK5CYII= + + + + True + + + 23, 22 + + + Letzte verschieben + + + 6, 25 + + + 40, 196 + + + 295, 25 + + + 1 + + + BindingNavigator1 + + + BindingNavigator1 + + + System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + SplitContainerTop.Panel2 + + + 0 + - 477, 15 + 463, 11 Segoe UI, 9pt, style=Bold @@ -313,7 +497,7 @@ SplitContainerTop.Panel2 - 0 + 1 Panel2 @@ -370,7 +554,7 @@ 0, 0 - 1072, 316 + 1072, 338 0 @@ -388,7 +572,7 @@ 0 - 1072, 316 + 1072, 338 Detailansicht @@ -412,7 +596,7 @@ 1 - 187, 65 + 124, 128 148, 22 @@ -519,7 +703,7 @@ 1 - 1157, 15 + 17, 50 Segoe UI, 8.25pt, style=Bold, Italic @@ -1014,7 +1198,7 @@ 2 - 1072, 316 + 1072, 338 Wiedervorlage @@ -1041,7 +1225,7 @@ Cyan - 1072, 291 + 1072, 313 0 @@ -1065,7 +1249,7 @@ 0, 25 - 1072, 291 + 1072, 313 2 @@ -1083,7 +1267,7 @@ 0 - 17, 93 + 332, 128 @@ -1269,7 +1453,7 @@ - 1072, 316 + 1072, 338 Positionen @@ -1299,7 +1483,7 @@ 0 - 773, 15 + 759, 11 False @@ -1711,14 +1895,11 @@ 5 - - 162, 11 - - 342, 15 + 328, 11 - 626, 15 + 612, 11 @@ -1729,10 +1910,10 @@ - 894, 15 + 880, 11 - 995, 15 + 981, 11 61, 4 @@ -1744,31 +1925,31 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 1322, 15 + 182, 50 - 17, 54 + 472, 50 - 295, 54 + 750, 50 - 567, 54 + 17, 89 - 1460, 54 + 910, 89 - 740, 54 + 190, 89 - 984, 54 + 434, 89 - 1222, 54 + 672, 89 - 1465, 15 + 325, 50 True @@ -2735,6 +2916,72 @@ DevExpress.Utils.ToolTipController, DevExpress.Utils.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + BindingNavigatorMoveFirstItem1 + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorMovePreviousItem1 + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorSeparator3 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorPositionItem1 + + + System.Windows.Forms.ToolStripTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorCountItem1 + + + System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorSeparator4 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorMoveNextItem1 + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorMoveLastItem1 + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorSeparator5 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorAddNewItem1 + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorDeleteItem1 + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + frmConstructor_Main diff --git a/app/DD-Record-Organiser/frmConstructor_Main.vb b/app/DD-Record-Organiser/frmConstructor_Main.vb index a949da2..ee42ccf 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.vb @@ -1980,7 +1980,8 @@ Public Class frmConstructor_Main ' Datatable laden GridControlMain.DataSource = DT - + BindingSource_Entity.DataSource = DT + BindingNavigator1.BindingSource = BindingSource_Entity grvwTiles.TileTemplate.Clear() @@ -2286,7 +2287,7 @@ Public Class frmConstructor_Main 'Databinding Neu BindingSource_Entity.DataSource = DT_SELECTION GridControlMain.DataSource = BindingSource_Entity - + BindingNavigator1.BindingSource = BindingSource_Entity ' Den Editor Initialisieren und Optionen setzen Dim CheckBoxEditorForDisplay = New RepositoryItemCheckEdit() From 3d8a88515c0a8b2d141425e5e67f66e74a344a2c Mon Sep 17 00:00:00 2001 From: SchreiberM Date: Mon, 2 May 2016 14:03:34 +0200 Subject: [PATCH 2/3] MS --- .../ClassControlBuilder.vb | 57 +++++++- .../ClassControlCommandsUI.vb | 10 +- app/DD-Record-Organiser/ClassControlLoader.vb | 1 + app/DD-Record-Organiser/ClassControlValues.vb | 4 +- .../DD-Record-Organiser.vbproj | 3 + .../My Project/Resources.Designer.vb | 20 +++ .../My Project/Resources.resx | 6 + app/DD-Record-Organiser/Resources/csv.png | Bin 0 -> 233 bytes .../Resources/doc_excel_csv.png | Bin 0 -> 601 bytes app/DD-Record-Organiser/Resources/dwg.png | Bin 0 -> 1466 bytes .../frmConstructor_Main.Designer.vb | 135 ++---------------- .../frmConstructor_Main.en-US.resx | 113 ++++++++++++++- .../frmConstructor_Main.resx | 58 ++++---- .../frmConstructor_Main.vb | 57 ++++++-- 14 files changed, 292 insertions(+), 172 deletions(-) create mode 100644 app/DD-Record-Organiser/Resources/csv.png create mode 100644 app/DD-Record-Organiser/Resources/doc_excel_csv.png create mode 100644 app/DD-Record-Organiser/Resources/dwg.png diff --git a/app/DD-Record-Organiser/ClassControlBuilder.vb b/app/DD-Record-Organiser/ClassControlBuilder.vb index 10cc35a..5339a55 100644 --- a/app/DD-Record-Organiser/ClassControlBuilder.vb +++ b/app/DD-Record-Organiser/ClassControlBuilder.vb @@ -241,12 +241,12 @@ Public Class ClassControlBuilder Dim ctrlvalID = ClassDatabase.Execute_Scalar(sqlguid) If Not IsNothing(ctrlvalID) Then Dim upd1 = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}' WHERE CONTROL_ID = {1} AND RECORD_ID = {2}", value.ToString, CONTROL_ID, CURRENT_RECORD_ID) - ClassDatabase.Execute_non_Query(upd1) + ' ClassDatabase.Execute_non_Query(upd1) Else Dim ins = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID,RECORD_ID,VALUE,ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", CONTROL_ID, CURRENT_RECORD_ID, value, Environment.UserName) - If ClassDatabase.Execute_non_Query(ins) = True Then - If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was nothing - Inserted the ControlValue '" & ins & "'") - End If + 'If ClassDatabase.Execute_non_Query(ins) = True Then + ' If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was nothing - Inserted the ControlValue '" & ins & "'") + 'End If End If @@ -264,6 +264,7 @@ Public Class ClassControlBuilder Dim dt As DataTable = ClassDatabase.Return_Datatable(sqlcommand) Dim type = dependingControl.GetType().Name + Select Case type Case "DateEdit" If dt.Rows.Count = 1 Then @@ -301,6 +302,8 @@ Public Class ClassControlBuilder End If Case "CustomComboBox" ControlLoader.Combobox.SetDataSource(DirectCast(dependingControl, CustomComboBox), dt) + Case "CheckedListBoxControl" + ControlLoader.CheckedListBox.SetDataSource(DirectCast(dependingControl, DevExpress.XtraEditors.CheckedListBoxControl), dt) Case "Label" If dt.Rows.Count = 1 Then Try @@ -392,6 +395,49 @@ Public Class ClassControlBuilder Depending_Controls(control, datatable, value) Enable_Controls(control, datatable1, value) + Console.WriteLine("value changed") + Catch ex As Exception + If ex.Message.Contains("Objektverweis") Or ex.Message.Contains("reference not set") Then + + Else + MsgBox("Error in OnComboBoxValueChanged - " & CONTROL_ID.ToString & ": " & ex.Message, MsgBoxStyle.Critical) + End If + End Try + End Sub + Public Sub OnCheckedItemChanged(sender As Object, ByVal e As EventArgs) + If CURRENT_RECORD_ENABLED = False Then Exit Sub + + Try + Dim control As Control = DirectCast(sender, Control) + Dim controlId As Integer = DirectCast(control.Tag, ClassControlMetadata).Id + CONTROL_ID = controlId + control.Update() + If CONTROL_ID = 993 Then + Console.WriteLine("Obacht") + End If + 'SQL für abhängige Auswahllisten + Dim SQL As String = String.Format("SELECT GUID, SQL_COMMAND_1 FROM TBPMO_CONTROL WHERE SQL_COMMAND_1 LIKE '%@{0}@%'", controlId) + 'SQL für enable control + Dim SQLenable As String = String.Format("SELECT GUID, SQL_COMMAND_2 FROM TBPMO_CONTROL WHERE SQL_COMMAND_2 LIKE '%@{0}@%'", controlId) + + + Dim CONTROL_VALUE As String = ClassControlCommandsUI.GetControlValue(control) + + If CURRENT_RECORD_ID = 0 Then + Exit Sub + End If + If CtrlCommandUI.IsInsert = False Then + ClassControlCommandsUI.UpdateMultipleValues(controlId, CURRENT_RECORD_ID, CONTROL_VALUE) + End If + + + Dim datatable As DataTable = ClassDatabase.Return_Datatable(SQL) + Dim datatable1 As DataTable = ClassDatabase.Return_Datatable(SQLenable) + Depending_Controls(control, datatable, CONTROL_VALUE) + Enable_Controls(control, datatable1, CONTROL_VALUE) + Dim values = New List(Of Object)(CONTROL_VALUE.Split(";").ToArray()) + 'Jetzt noch die checked Items setzen + ClassControlValues.LoadControlValue(CURRENT_RECORD_ID, CURRENT_PARENT_ID, controlId, control, values, 99) 'Dim sqlcommand As String = datatable.Rows(0).Item("SQL_COMMAND_1") @@ -428,7 +474,7 @@ Public Class ClassControlBuilder If ex.Message.Contains("Objektverweis") Or ex.Message.Contains("reference not set") Then Else - MsgBox("Error in OnComboBoxValueChanged - " & CONTROL_ID.ToString & ": " & ex.Message, MsgBoxStyle.Critical) + MsgBox("Error in OnCheckedItemChanged - " & CONTROL_ID.ToString & ": " & ex.Message, MsgBoxStyle.Critical) End If End Try End Sub @@ -567,6 +613,7 @@ Public Class ClassControlBuilder Case "CheckedListBoxControl" Dim chklistbox As DevExpress.XtraEditors.CheckedListBoxControl = CType(control, DevExpress.XtraEditors.CheckedListBoxControl) AddHandler chklistbox.ItemCheck, AddressOf RecordChanged + AddHandler chklistbox.ItemCheck, AddressOf OnCheckedItemChanged ' AddHandler chklistbox.EnabledChanged, AddressOf OnEnabledChanged Case "DataGridView" diff --git a/app/DD-Record-Organiser/ClassControlCommandsUI.vb b/app/DD-Record-Organiser/ClassControlCommandsUI.vb index a374fc9..d90ae9b 100644 --- a/app/DD-Record-Organiser/ClassControlCommandsUI.vb +++ b/app/DD-Record-Organiser/ClassControlCommandsUI.vb @@ -545,7 +545,7 @@ Public Class ClassControlCommandsUI End Sub - Public Sub UpdateMultipleValues(ControlId As Integer, RecordId As Integer, value As String) + Public Shared Sub UpdateMultipleValues(ControlId As Integer, RecordId As Integer, value As String) Try If IsNothing(value) Then Exit Sub @@ -576,7 +576,7 @@ Public Class ClassControlCommandsUI End Try End Sub - Function GetControlValue(ctrl As Control) As String + Public Shared Function GetControlValue(ctrl As Control) As String Dim type = ctrl.GetType().Name Dim CONTROL_ID As Integer = DirectCast(ctrl.Tag, ClassControlMetadata).Id ' GetControlID_for_RecordID(ctrl.Name, CURRENT_RECORD_ID) @@ -678,7 +678,7 @@ Public Class ClassControlCommandsUI Next Else - + For Each item As Object In DirectCast(ctrl, DevExpress.XtraEditors.CheckedListBoxControl).CheckedItems Dim row As DataRowView = CType(item, DataRowView) If row.DataView.Table.Columns.Count = 1 Then @@ -690,12 +690,12 @@ Public Class ClassControlCommandsUI End If checked_result_string = String.Join(";", checked_result) Next - + End If - + ' Hier wird ein String zurückgegeben, der als VALUE gespeichert werden soll ' Überspringt den Rest der funktion If Not IsNothing(checked_result_string) Then diff --git a/app/DD-Record-Organiser/ClassControlLoader.vb b/app/DD-Record-Organiser/ClassControlLoader.vb index 7a9c728..1639b2c 100644 --- a/app/DD-Record-Organiser/ClassControlLoader.vb +++ b/app/DD-Record-Organiser/ClassControlLoader.vb @@ -370,6 +370,7 @@ Public Class CheckedListBox : Inherits _ListControl Public Shared Sub LoadValue(control As DevExpress.XtraEditors.CheckedListBoxControl, values As List(Of Object)) + If IsNothing(values) Then Exit Sub End If diff --git a/app/DD-Record-Organiser/ClassControlValues.vb b/app/DD-Record-Organiser/ClassControlValues.vb index cb7bb06..b48920d 100644 --- a/app/DD-Record-Organiser/ClassControlValues.vb +++ b/app/DD-Record-Organiser/ClassControlValues.vb @@ -219,7 +219,7 @@ Public Class ClassControlValues End Sub - Private Shared Sub LoadControlValue(recordId As Integer, parentRecordId As Integer, controlId As Integer, control As Control, values As List(Of Object), entity_ID As Integer) + Public Shared Sub LoadControlValue(recordId As Integer, parentRecordId As Integer, controlId As Integer, control As Control, values As List(Of Object), entity_ID As Integer) Try ' Für die meisten Controls wird nur das erste Element der Liste benötigt Dim value As String = Nothing @@ -240,7 +240,7 @@ Public Class ClassControlValues ControlLoader.Label.LoadValue(label, recordId, parentRecordId, value, entity_ID) Case GetType(CustomComboBox) - + Dim combobox As CustomComboBox = DirectCast(control, CustomComboBox) ControlLoader.Combobox.LoadValue(combobox, recordId, parentRecordId, value) diff --git a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj index 4cd728d..9fe0483 100644 --- a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj +++ b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj @@ -1166,6 +1166,8 @@ + + @@ -1242,6 +1244,7 @@ + diff --git a/app/DD-Record-Organiser/My Project/Resources.Designer.vb b/app/DD-Record-Organiser/My Project/Resources.Designer.vb index da95f5e..c62f518 100644 --- a/app/DD-Record-Organiser/My Project/Resources.Designer.vb +++ b/app/DD-Record-Organiser/My Project/Resources.Designer.vb @@ -760,6 +760,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property doc_excel_csv() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("doc_excel_csv", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -780,6 +790,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property dwg() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("dwg", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/app/DD-Record-Organiser/My Project/Resources.resx b/app/DD-Record-Organiser/My Project/Resources.resx index 8378996..ed2658d 100644 --- a/app/DD-Record-Organiser/My Project/Resources.resx +++ b/app/DD-Record-Organiser/My Project/Resources.resx @@ -616,4 +616,10 @@ ..\Resources\windream-Logo-transparent_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\doc_excel_csv.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dwg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/app/DD-Record-Organiser/Resources/csv.png b/app/DD-Record-Organiser/Resources/csv.png new file mode 100644 index 0000000000000000000000000000000000000000..3e9d6ed41b4901ee2e3811ef6e85df0978acf1d2 GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@H!x2AA6$+S6}hN-9%vmdKI;Vst04O9%8~^|S literal 0 HcmV?d00001 diff --git a/app/DD-Record-Organiser/Resources/doc_excel_csv.png b/app/DD-Record-Organiser/Resources/doc_excel_csv.png new file mode 100644 index 0000000000000000000000000000000000000000..6bb6cefd91d0a2b9a6d5a35aae0447233add1868 GIT binary patch literal 601 zcmV-f0;c_mP)vF%VLzRLl%v+>Ll35SX}eLJts=$t0^* zt9Oz#CS&3bQ5FvwhQVV#pNFcdoVi>M*=&}R;PH4!7fvJ+F>%j&pi-&uC`r-{%CgKO zLDzM7yI+s6q`9pp(P)&}49&pY z`(+%Lf8gx$1Urj6JmbjH7|t)w(aBoT{=`6`P=J^iMTf(|OOo|J1{U7Vz&$vCrWOT5 z(@*hob{K`9XRzOA__VSH($w~YB0ue!SmT6sAUz~ha2c~ zcH?1>6W{i~;@zux%KBJ*qoK(v(UiRxB1d{eC|mqq!H?V|0i5>;6c>K`0c0%jL34u$IE-^YLu;7D|vn ncWgDw6gU6#F#ZqmzXA*Zhmoj+0zUpb00000NkvXXu0mjf>m3)W literal 0 HcmV?d00001 diff --git a/app/DD-Record-Organiser/Resources/dwg.png b/app/DD-Record-Organiser/Resources/dwg.png new file mode 100644 index 0000000000000000000000000000000000000000..698eb4c6d39413ab1b4ee682f50cfbd54f97d61f GIT binary patch literal 1466 zcmV;r1x5OaP)#C_4(;?7R1 zK#J5Kj4{4U!^cpy+&7zEvOS}gQq=>Cu*_jf2|(?oyD)ge?pvdg7JS|@Cx}GiwS?8@ zJ!tF`bsJ~8jJFrru7_WB4KZwIlPWDH1uNW#GfvuP8MX5_Hgo*D>#E_5~{ zkGl1Xu$6ANm%>r~n-`DdrsLGcT-wQ@bttT^F+G;s90v%d)Iexffs!<@EU~G^n9JW; zl}QFU)IXGs0~Grc-2nt71-6MYMgj;}Xy(8Xz}P)vH}A0WR7{7-bSYxAFr^fx;1}`=nTr!))^~` zP5@C#LdHK0NAZIj~ixwegH}^0v9Dr zP{RLCl13eBmSI4W>Ei;(7dVxj7EYBhW^m}+k)^sTQOipBavs+&L z#jkwZ7giFfhx##-Pte4;%^RI2-*Z(|l8MQfj;o~0UL^S#%D=pwyu+*Vb7 zxI2W;Zidt~tzOJ&{W(Q`Rs|MhR>aNg0mPIAu@Ai=fY-k;0Ae%S>%RgF0Lhap U74tHN9smFU07*qoM6N<$g4}Mj%>V!Z literal 0 HcmV?d00001 diff --git a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb index 3294fd6..1de5927 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb @@ -22,6 +22,7 @@ Partial Class frmConstructor_Main 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConstructor_Main)) Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() Dim GridLevelNode2 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() @@ -29,12 +30,12 @@ Partial Class frmConstructor_Main Me.SplitContainerMain = New DevExpress.XtraEditors.SplitContainerControl() Me.SplitContainerTop = New DevExpress.XtraEditors.SplitContainerControl() Me.TreeViewMain = New System.Windows.Forms.TreeView() - Me.CMSEntity = New System.Windows.Forms.ContextMenuStrip() + Me.CMSEntity = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ResetEbenenAuswahlToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DateiimportEntitätToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.FormDesignerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.GridControlMain = New DevExpress.XtraGrid.GridControl() - Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip() + Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.FunktionenDataGridToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() Me.AnsichtUmschaltenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -58,7 +59,7 @@ Partial Class frmConstructor_Main Me.pnlDetails = New System.Windows.Forms.Panel() Me.TabWindream = New DevExpress.XtraTab.XtraTabPage() Me.GridControlDocSearch = New DevExpress.XtraGrid.GridControl() - Me.ContextMenuStripResultFiles = New System.Windows.Forms.ContextMenuStrip() + Me.ContextMenuStripResultFiles = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DateiÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator7 = New System.Windows.Forms.ToolStripSeparator() Me.CopyToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -93,7 +94,7 @@ Partial Class frmConstructor_Main Me.Panel1 = New System.Windows.Forms.Panel() Me.GridControlPos = New DevExpress.XtraGrid.GridControl() Me.grvwGridPos = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.BindingNavigatorPOS = New System.Windows.Forms.BindingNavigator() + Me.BindingNavigatorPOS = New System.Windows.Forms.BindingNavigator(Me.components) Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel() Me.BindingNavigatorDeleteItem = New System.Windows.Forms.ToolStripButton() @@ -128,6 +129,7 @@ Partial Class frmConstructor_Main Me.GridControlParent = New DevExpress.XtraGrid.GridControl() Me.GridViewParent = New DevExpress.XtraGrid.Views.Grid.GridView() Me.btnRelinkParentID = New System.Windows.Forms.Button() + Me.BindingSource_Entity = New System.Windows.Forms.BindingSource(Me.components) Me.NavPane = New DevExpress.XtraBars.Navigation.TileNavPane() Me.NavButtonHome = New DevExpress.XtraBars.Navigation.NavButton() Me.NavButtonRefresh = New DevExpress.XtraBars.Navigation.NavButton() @@ -135,32 +137,19 @@ Partial Class frmConstructor_Main Me.tsslblStatus = New System.Windows.Forms.ToolStripStatusLabel() Me.tsslblRecord = New System.Windows.Forms.ToolStripStatusLabel() Me.tsslblWorkflowstate = New System.Windows.Forms.ToolStripStatusLabel() - Me.BindingSource_Entity = New System.Windows.Forms.BindingSource() Me.DD_ECMAdmin = New DD_Record_Organiser.DD_ECMAdmin() - Me.ImageCollection1 = New DevExpress.Utils.ImageCollection() - Me.ttToolTip = New System.Windows.Forms.ToolTip() - Me.ContextMenuDetails = New System.Windows.Forms.ContextMenuStrip() + Me.ImageCollection1 = New DevExpress.Utils.ImageCollection(Me.components) + Me.ttToolTip = New System.Windows.Forms.ToolTip(Me.components) + Me.ContextMenuDetails = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet() - Me.VWPMO_WF_USER_ACTIVEBindingSource = New System.Windows.Forms.BindingSource() + Me.VWPMO_WF_USER_ACTIVEBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.VWPMO_WF_USER_ACTIVETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter() Me.TableAdapterManager = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager() Me.TBPMO_FILES_USERTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_FILES_USERTableAdapter() - Me.VWPMO_WF_ACTIVEBindingSource = New System.Windows.Forms.BindingSource() + Me.VWPMO_WF_ACTIVEBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.VWPMO_WF_ACTIVETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter() - Me.TBPMO_FILES_USERBindingSource = New System.Windows.Forms.BindingSource() - Me.ToolTipController = New DevExpress.Utils.ToolTipController() - Me.BindingNavigator1 = New System.Windows.Forms.BindingNavigator() - Me.BindingNavigatorMoveFirstItem1 = New System.Windows.Forms.ToolStripButton() - Me.BindingNavigatorMovePreviousItem1 = New System.Windows.Forms.ToolStripButton() - Me.BindingNavigatorSeparator3 = New System.Windows.Forms.ToolStripSeparator() - Me.BindingNavigatorPositionItem1 = New System.Windows.Forms.ToolStripTextBox() - Me.BindingNavigatorCountItem1 = New System.Windows.Forms.ToolStripLabel() - Me.BindingNavigatorSeparator4 = New System.Windows.Forms.ToolStripSeparator() - Me.BindingNavigatorMoveNextItem1 = New System.Windows.Forms.ToolStripButton() - Me.BindingNavigatorMoveLastItem1 = New System.Windows.Forms.ToolStripButton() - Me.BindingNavigatorSeparator5 = New System.Windows.Forms.ToolStripSeparator() - Me.BindingNavigatorAddNewItem1 = New System.Windows.Forms.ToolStripButton() - Me.BindingNavigatorDeleteItem1 = New System.Windows.Forms.ToolStripButton() + Me.TBPMO_FILES_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.ToolTipController = New DevExpress.Utils.ToolTipController(Me.components) CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerMain.SuspendLayout() CType(Me.SplitContainerTop, System.ComponentModel.ISupportInitialize).BeginInit() @@ -195,16 +184,14 @@ Partial Class frmConstructor_Main Me.Panel2.SuspendLayout() CType(Me.GridControlParent, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridViewParent, System.ComponentModel.ISupportInitialize).BeginInit() - Me.StatusStrip_Main.SuspendLayout() CType(Me.BindingSource_Entity, System.ComponentModel.ISupportInitialize).BeginInit() + Me.StatusStrip_Main.SuspendLayout() CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.VWPMO_WF_USER_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.VWPMO_WF_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPMO_FILES_USERBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.BindingNavigator1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.BindingNavigator1.SuspendLayout() Me.SuspendLayout() ' 'SplitContainerMain @@ -225,7 +212,6 @@ Partial Class frmConstructor_Main Me.SplitContainerTop.Name = "SplitContainerTop" Me.SplitContainerTop.Panel1.Controls.Add(Me.TreeViewMain) resources.ApplyResources(Me.SplitContainerTop.Panel1, "SplitContainerTop.Panel1") - Me.SplitContainerTop.Panel2.Controls.Add(Me.BindingNavigator1) Me.SplitContainerTop.Panel2.Controls.Add(Me.GridControlMain) resources.ApplyResources(Me.SplitContainerTop.Panel2, "SplitContainerTop.Panel2") Me.SplitContainerTop.SplitterPosition = 283 @@ -1058,82 +1044,6 @@ Partial Class frmConstructor_Main Me.TBPMO_FILES_USERBindingSource.DataMember = "TBPMO_FILES_USER" Me.TBPMO_FILES_USERBindingSource.DataSource = Me.DD_DMSDataSet ' - 'BindingNavigator1 - ' - Me.BindingNavigator1.AddNewItem = Me.BindingNavigatorAddNewItem1 - Me.BindingNavigator1.BindingSource = Me.BindingSource_Entity - Me.BindingNavigator1.CountItem = Me.BindingNavigatorCountItem1 - Me.BindingNavigator1.DeleteItem = Me.BindingNavigatorDeleteItem1 - resources.ApplyResources(Me.BindingNavigator1, "BindingNavigator1") - Me.BindingNavigator1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem1, Me.BindingNavigatorMovePreviousItem1, Me.BindingNavigatorSeparator3, Me.BindingNavigatorPositionItem1, Me.BindingNavigatorCountItem1, Me.BindingNavigatorSeparator4, Me.BindingNavigatorMoveNextItem1, Me.BindingNavigatorMoveLastItem1, Me.BindingNavigatorSeparator5, Me.BindingNavigatorAddNewItem1, Me.BindingNavigatorDeleteItem1}) - Me.BindingNavigator1.MoveFirstItem = Me.BindingNavigatorMoveFirstItem1 - Me.BindingNavigator1.MoveLastItem = Me.BindingNavigatorMoveLastItem1 - Me.BindingNavigator1.MoveNextItem = Me.BindingNavigatorMoveNextItem1 - Me.BindingNavigator1.MovePreviousItem = Me.BindingNavigatorMovePreviousItem1 - Me.BindingNavigator1.Name = "BindingNavigator1" - Me.BindingNavigator1.PositionItem = Me.BindingNavigatorPositionItem1 - ' - 'BindingNavigatorMoveFirstItem1 - ' - Me.BindingNavigatorMoveFirstItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - resources.ApplyResources(Me.BindingNavigatorMoveFirstItem1, "BindingNavigatorMoveFirstItem1") - Me.BindingNavigatorMoveFirstItem1.Name = "BindingNavigatorMoveFirstItem" - ' - 'BindingNavigatorMovePreviousItem1 - ' - Me.BindingNavigatorMovePreviousItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - resources.ApplyResources(Me.BindingNavigatorMovePreviousItem1, "BindingNavigatorMovePreviousItem1") - Me.BindingNavigatorMovePreviousItem1.Name = "BindingNavigatorMovePreviousItem" - ' - 'BindingNavigatorSeparator3 - ' - Me.BindingNavigatorSeparator3.Name = "BindingNavigatorSeparator" - resources.ApplyResources(Me.BindingNavigatorSeparator3, "BindingNavigatorSeparator3") - ' - 'BindingNavigatorPositionItem1 - ' - resources.ApplyResources(Me.BindingNavigatorPositionItem1, "BindingNavigatorPositionItem1") - Me.BindingNavigatorPositionItem1.Name = "BindingNavigatorPositionItem" - ' - 'BindingNavigatorCountItem1 - ' - Me.BindingNavigatorCountItem1.Name = "BindingNavigatorCountItem" - resources.ApplyResources(Me.BindingNavigatorCountItem1, "BindingNavigatorCountItem1") - ' - 'BindingNavigatorSeparator4 - ' - Me.BindingNavigatorSeparator4.Name = "BindingNavigatorSeparator" - resources.ApplyResources(Me.BindingNavigatorSeparator4, "BindingNavigatorSeparator4") - ' - 'BindingNavigatorMoveNextItem1 - ' - Me.BindingNavigatorMoveNextItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - resources.ApplyResources(Me.BindingNavigatorMoveNextItem1, "BindingNavigatorMoveNextItem1") - Me.BindingNavigatorMoveNextItem1.Name = "BindingNavigatorMoveNextItem" - ' - 'BindingNavigatorMoveLastItem1 - ' - Me.BindingNavigatorMoveLastItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - resources.ApplyResources(Me.BindingNavigatorMoveLastItem1, "BindingNavigatorMoveLastItem1") - Me.BindingNavigatorMoveLastItem1.Name = "BindingNavigatorMoveLastItem" - ' - 'BindingNavigatorSeparator5 - ' - Me.BindingNavigatorSeparator5.Name = "BindingNavigatorSeparator" - resources.ApplyResources(Me.BindingNavigatorSeparator5, "BindingNavigatorSeparator5") - ' - 'BindingNavigatorAddNewItem1 - ' - Me.BindingNavigatorAddNewItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - resources.ApplyResources(Me.BindingNavigatorAddNewItem1, "BindingNavigatorAddNewItem1") - Me.BindingNavigatorAddNewItem1.Name = "BindingNavigatorAddNewItem" - ' - 'BindingNavigatorDeleteItem1 - ' - Me.BindingNavigatorDeleteItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - resources.ApplyResources(Me.BindingNavigatorDeleteItem1, "BindingNavigatorDeleteItem1") - Me.BindingNavigatorDeleteItem1.Name = "BindingNavigatorDeleteItem" - ' 'frmConstructor_Main ' resources.ApplyResources(Me, "$this") @@ -1184,18 +1094,15 @@ Partial Class frmConstructor_Main Me.Panel2.ResumeLayout(False) CType(Me.GridControlParent, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridViewParent, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.BindingSource_Entity, System.ComponentModel.ISupportInitialize).EndInit() Me.StatusStrip_Main.ResumeLayout(False) Me.StatusStrip_Main.PerformLayout() - CType(Me.BindingSource_Entity, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.VWPMO_WF_USER_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.VWPMO_WF_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBPMO_FILES_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.BindingNavigator1, System.ComponentModel.ISupportInitialize).EndInit() - Me.BindingNavigator1.ResumeLayout(False) - Me.BindingNavigator1.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -1323,16 +1230,4 @@ Partial Class frmConstructor_Main Friend WithEvents DeleteToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents ToolStripSeparator9 As System.Windows.Forms.ToolStripSeparator Friend WithEvents PropertiesToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents BindingNavigator1 As System.Windows.Forms.BindingNavigator - Friend WithEvents BindingNavigatorAddNewItem1 As System.Windows.Forms.ToolStripButton - Friend WithEvents BindingNavigatorCountItem1 As System.Windows.Forms.ToolStripLabel - Friend WithEvents BindingNavigatorDeleteItem1 As System.Windows.Forms.ToolStripButton - Friend WithEvents BindingNavigatorMoveFirstItem1 As System.Windows.Forms.ToolStripButton - Friend WithEvents BindingNavigatorMovePreviousItem1 As System.Windows.Forms.ToolStripButton - Friend WithEvents BindingNavigatorSeparator3 As System.Windows.Forms.ToolStripSeparator - Friend WithEvents BindingNavigatorPositionItem1 As System.Windows.Forms.ToolStripTextBox - Friend WithEvents BindingNavigatorSeparator4 As System.Windows.Forms.ToolStripSeparator - Friend WithEvents BindingNavigatorMoveNextItem1 As System.Windows.Forms.ToolStripButton - Friend WithEvents BindingNavigatorMoveLastItem1 As System.Windows.Forms.ToolStripButton - Friend WithEvents BindingNavigatorSeparator5 As System.Windows.Forms.ToolStripSeparator End Class diff --git a/app/DD-Record-Organiser/frmConstructor_Main.en-US.resx b/app/DD-Record-Organiser/frmConstructor_Main.en-US.resx index 58f13bc..ffed1d1 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.en-US.resx +++ b/app/DD-Record-Organiser/frmConstructor_Main.en-US.resx @@ -219,8 +219,17 @@ Refresh Data + + 179, 6 + + + 182, 22 + + + Delete record + - 183, 170 + 183, 198 @@ -336,6 +345,108 @@ + + Default + + + 127, 22 + + + Open file + + + 124, 6 + + + 127, 22 + + + Copy file + + + 124, 6 + + + 127, 22 + + + Delete file + + + 124, 6 + + + 127, 22 + + + Properties + + + 128, 110 + + + + + + + + + + + + None + + + + + + + + + Default + + + Top, Left + + + + + + Tile + + + Inherit + + + 0, 0 + + + Center + + + + + + None + + + + + + 0 + + + Regular + + + Horizontal + + + + + + + Default diff --git a/app/DD-Record-Organiser/frmConstructor_Main.resx b/app/DD-Record-Organiser/frmConstructor_Main.resx index 8394ebb..e3e8722 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.resx +++ b/app/DD-Record-Organiser/frmConstructor_Main.resx @@ -132,7 +132,7 @@ 0, 0 - 1693, 54 + 17, 134 194, 22 @@ -193,7 +193,7 @@ Panel1 - 477, 15 + 615, 17 Segoe UI, 9pt, style=Bold @@ -412,7 +412,7 @@ 1 - 187, 65 + 124, 134 148, 22 @@ -519,7 +519,7 @@ 1 - 1157, 15 + 179, 56 Segoe UI, 8.25pt, style=Bold, Italic @@ -1083,7 +1083,7 @@ 0 - 17, 93 + 332, 134 @@ -1299,7 +1299,7 @@ 0 - 773, 15 + 911, 17 False @@ -1609,6 +1609,9 @@ 4 + + 314, 17 + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -1664,7 +1667,7 @@ 6 - 17, 17 + 171, 17 53, 17 @@ -1711,14 +1714,11 @@ 5 - - 162, 11 - - 342, 15 + 480, 17 - 626, 15 + 764, 17 @@ -1729,10 +1729,10 @@ - 894, 15 + 1032, 17 - 995, 15 + 17, 56 61, 4 @@ -1744,31 +1744,31 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 1322, 15 + 344, 56 - 17, 54 + 634, 56 - 295, 54 + 912, 56 - 567, 54 + 17, 95 - 1460, 54 + 910, 95 - 740, 54 + 190, 95 - 984, 54 + 434, 95 - 1222, 54 + 672, 95 - 1465, 15 + 487, 56 True @@ -2621,6 +2621,12 @@ DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + BindingSource_Entity + + + System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + TileNavCategory1 @@ -2657,12 +2663,6 @@ System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - BindingSource_Entity - - - System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - DD_ECMAdmin diff --git a/app/DD-Record-Organiser/frmConstructor_Main.vb b/app/DD-Record-Organiser/frmConstructor_Main.vb index de4d534..26d3bc3 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.vb @@ -263,18 +263,45 @@ Public Class frmConstructor_Main MsgBox("Error in Save_Grid_Layout:" & vbNewLine & ex.Message) End Try End Sub - + Sub Save_DocGrid_Layout() + Try + If ACT_EBENE_STRING Is Nothing Then + Exit Sub + End If + Dim EntityRegex As New RegularExpressions.Regex("\s+\(\d+\)") + Dim EntityName As String = EntityRegex.Replace(ACT_EBENE_STRING, "") + Dim Filename As String = String.Format("{0}-{1}-{2}-UserLayout.xml", GridViewDoc_Search.Name, GetSafeFilename(EntityName), CONSTRUCTORID) + Dim XMLPath = System.IO.Path.Combine(Application.UserAppDataPath(), Filename) + GridViewDoc_Search.SaveLayoutToXml(XMLPath) + ' Update_Status_Label(True, "Grid Layout Loaded") + Catch ex As Exception + MsgBox("Error in Save_DocGrid_Layout:" & vbNewLine & ex.Message) + End Try + End Sub + Sub Load_DocGrid_Layout() + Try + If ACT_EBENE_STRING Is Nothing Then + Exit Sub + End If + Dim EntityRegex As New RegularExpressions.Regex("\s+\(\d+\)") + Dim EntityName As String = EntityRegex.Replace(ACT_EBENE_STRING, "") + Dim Filename As String = String.Format("{0}-{1}-{2}-UserLayout.xml", GridViewDoc_Search.Name, GetSafeFilename(EntityName), CONSTRUCTORID) + Dim XMLPath = System.IO.Path.Combine(Application.UserAppDataPath(), Filename) + If File.Exists(XMLPath) Then + GridViewDoc_Search.RestoreLayoutFromXml(XMLPath) + GridViewDoc_Search.GuessAutoFilterRowValuesFromFilter() + End If + + Catch ex As Exception + MsgBox("Error in Load_DocGrid_Layout:" & vbNewLine & ex.Message) + End Try + End Sub Sub Load_Grid_Layout() Try Dim XMLPath = Get_Grid_Layout_Filename() If File.Exists(XMLPath) And GRID_TYPE = GridType.Grid Then grvwGrid.RestoreLayoutFromXml(XMLPath) - - 'grvwGrid.ClearGrouping() - ' grvwGrid.ClearSelection() - 'grvwGrid.OptionsView.ShowPreview = False - grvwGridPos.GuessAutoFilterRowValuesFromFilter() - 'Update_Status_Label(True, "Grid Layout Loaded") + grvwGrid.GuessAutoFilterRowValuesFromFilter() End If Catch ex As Exception MsgBox("Error in Load_Grid_Layout: " & vbNewLine & ex.Message) @@ -1983,7 +2010,6 @@ Public Class frmConstructor_Main ' Datatable laden GridControlMain.DataSource = DT BindingSource_Entity.DataSource = DT - BindingNavigator1.BindingSource = BindingSource_Entity grvwTiles.TileTemplate.Clear() @@ -2289,8 +2315,7 @@ Public Class frmConstructor_Main 'Databinding Neu BindingSource_Entity.DataSource = DT_SELECTION GridControlMain.DataSource = BindingSource_Entity - BindingNavigator1.BindingSource = BindingSource_Entity - + ' Den Editor Initialisieren und Optionen setzen Dim CheckBoxEditorForDisplay = New RepositoryItemCheckEdit() CheckBoxEditorForDisplay.ValueChecked = 1 @@ -3543,6 +3568,7 @@ Public Class frmConstructor_Main 'Icon zuweisen Select Case extension Case ".csv" + NewRow.Item(0) = My.Resources.doc_excel_csv Case ".txt" NewRow.Item(0) = My.Resources.text Case ".pdf" @@ -3559,6 +3585,8 @@ Public Class frmConstructor_Main NewRow.Item(0) = My.Resources.ppt Case ".pptx" NewRow.Item(0) = My.Resources.ppt + Case ".dwg" + NewRow.Item(0) = My.Resources.dwg Case Else NewRow.Item(0) = My.Resources._blank End Select @@ -3781,6 +3809,7 @@ Public Class frmConstructor_Main Load_POSGrid_Layout() End If If TCDetails.SelectedTabPage.Text.ToLower.StartsWith("windr") Then + Load_DocGrid_Layout() tsButtonEdit.Enabled = False If RECORD_ID = 0 Then RUN_WD_SEARCH(WD_Suche, "ENTITY") @@ -4836,4 +4865,12 @@ Public Class frmConstructor_Main End Try File_open() End Sub + + Private Sub TabWindream_Leave(sender As Object, e As EventArgs) Handles TabWindream.Leave + Save_DocGrid_Layout() + End Sub + + Private Sub GridControlDocSearch_DragDrop(sender As Object, e As DragEventArgs) Handles GridControlDocSearch.DragDrop + Drag_Drop(e) + End Sub End Class \ No newline at end of file From b90199ac7bbc72d63242fa0bd4a16afcfe94f750 Mon Sep 17 00:00:00 2001 From: SchreiberM Date: Mon, 2 May 2016 14:52:53 +0200 Subject: [PATCH 3/3] MS1 --- .../DD_ECMAdmin.Designer.vb | 79 +- app/DD-Record-Organiser/DD_ECMAdmin.xsd | 43 +- .../frmConstructorDesigner.Designer.vb | 40 +- .../frmConstructorDesigner.resx | 755 ++++++++---------- 4 files changed, 451 insertions(+), 466 deletions(-) diff --git a/app/DD-Record-Organiser/DD_ECMAdmin.Designer.vb b/app/DD-Record-Organiser/DD_ECMAdmin.Designer.vb index a0d9d32..1032728 100644 --- a/app/DD-Record-Organiser/DD_ECMAdmin.Designer.vb +++ b/app/DD-Record-Organiser/DD_ECMAdmin.Designer.vb @@ -1038,6 +1038,8 @@ Partial Public Class DD_ECMAdmin Private columnSQL_RIGHT_READ_AND_VIEW_ONLY As Global.System.Data.DataColumn + Private columnSQL_RIGHT_WINDREAM_VIEW As Global.System.Data.DataColumn + _ Public Sub New() @@ -1265,6 +1267,14 @@ Partial Public Class DD_ECMAdmin End Get End Property + _ + Public ReadOnly Property SQL_RIGHT_WINDREAM_VIEWColumn() As Global.System.Data.DataColumn + Get + Return Me.columnSQL_RIGHT_WINDREAM_VIEW + End Get + End Property + _ @@ -1325,9 +1335,10 @@ Partial Public Class DD_ECMAdmin ByVal LOAD_DIRECT As Boolean, _ ByVal SQL_QUICK_VIEW As String, _ ByVal CONTROL_DOCTYPE_MATCH As Integer, _ - ByVal SQL_RIGHT_READ_AND_VIEW_ONLY As String) As TBPMO_FORM_CONSTRUCTOR_DETAILRow + ByVal SQL_RIGHT_READ_AND_VIEW_ONLY As String, _ + ByVal SQL_RIGHT_WINDREAM_VIEW As String) As TBPMO_FORM_CONSTRUCTOR_DETAILRow Dim rowTBPMO_FORM_CONSTRUCTOR_DETAILRow As TBPMO_FORM_CONSTRUCTOR_DETAILRow = CType(Me.NewRow, TBPMO_FORM_CONSTRUCTOR_DETAILRow) - Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5, LOAD_DIRECT, SQL_QUICK_VIEW, CONTROL_DOCTYPE_MATCH, SQL_RIGHT_READ_AND_VIEW_ONLY} + Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5, LOAD_DIRECT, SQL_QUICK_VIEW, CONTROL_DOCTYPE_MATCH, SQL_RIGHT_READ_AND_VIEW_ONLY, SQL_RIGHT_WINDREAM_VIEW} If (Not (parentTBPMO_FORM_CONSTRUCTORRowByFK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID) Is Nothing) Then columnValuesArray(1) = parentTBPMO_FORM_CONSTRUCTORRowByFK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID(0) End If @@ -1383,6 +1394,7 @@ Partial Public Class DD_ECMAdmin Me.columnSQL_QUICK_VIEW = MyBase.Columns("SQL_QUICK_VIEW") Me.columnCONTROL_DOCTYPE_MATCH = MyBase.Columns("CONTROL_DOCTYPE_MATCH") Me.columnSQL_RIGHT_READ_AND_VIEW_ONLY = MyBase.Columns("SQL_RIGHT_READ_AND_VIEW_ONLY") + Me.columnSQL_RIGHT_WINDREAM_VIEW = MyBase.Columns("SQL_RIGHT_WINDREAM_VIEW") End Sub _ + Public Property SQL_RIGHT_WINDREAM_VIEW() As String + Get + Return CType(Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.SQL_RIGHT_WINDREAM_VIEWColumn), String) + End Get + Set(value As String) + Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.SQL_RIGHT_WINDREAM_VIEWColumn) = value + End Set + End Property + _ Public Property TBPMO_FORM_CONSTRUCTORRow() As TBPMO_FORM_CONSTRUCTORRow @@ -6911,6 +6938,7 @@ Namespace DD_ECMAdminTableAdapters tableMapping.ColumnMappings.Add("SQL_QUICK_VIEW", "SQL_QUICK_VIEW") tableMapping.ColumnMappings.Add("CONTROL_DOCTYPE_MATCH", "CONTROL_DOCTYPE_MATCH") tableMapping.ColumnMappings.Add("SQL_RIGHT_READ_AND_VIEW_ONLY", "SQL_RIGHT_READ_AND_VIEW_ONLY") + tableMapping.ColumnMappings.Add("SQL_RIGHT_WINDREAM_VIEW", "SQL_RIGHT_WINDREAM_VIEW") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection @@ -6923,16 +6951,16 @@ Namespace DD_ECMAdminTableAdapters ", FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBE" & _ "NE2, ADDED_WHO, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & " " & _ " SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEAR" & _ - "CH_PATTERN5, CONTROL_DOCTYPE_MATCH, SQL_RIGHT_READ_AND_VIEW_ONLY)" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "VALUES " & _ - " (@CONSTRUCT_ID,@FORM_ID,@PARENT_ID,@LEVEL1_SELECT,@SEQUENCE,@SQL_SELECT_EBENE1," & _ - "@SQL_SELECT_EBENE2,@ADDED_WHO,@COLUMN_NAME1,@COLUMN_NAME2,@WINDREAM_SEARCH,@SEAR" & _ - "CH_PATTERN1,@SEARCH_PATTERN2,@SEARCH_PATTERN3,@SEARCH_PATTERN4,@SEARCH_PATTERN5," & _ - "@CONTROL_DOCTYPE_MATCH,@SQL_RIGHT_READ_AND_VIEW_ONLY); " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "SELECT GUID, CONSTRUC" & _ - "T_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT" & _ - "_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_" & _ - "NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARC" & _ - "H_PATTERN4, SEARCH_PATTERN5 FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE (GUID = SCO" & _ - "PE_IDENTITY())" + "CH_PATTERN5, CONTROL_DOCTYPE_MATCH, SQL_RIGHT_READ_AND_VIEW_ONLY, SQL_RIGHT_WIND" & _ + "REAM_VIEW)" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "VALUES (@CONSTRUCT_ID,@FORM_ID,@PARENT_ID,@LEVEL1_SELECT,@SEQ" & _ + "UENCE,@SQL_SELECT_EBENE1,@SQL_SELECT_EBENE2,@ADDED_WHO,@COLUMN_NAME1,@COLUMN_NAM" & _ + "E2,@WINDREAM_SEARCH,@SEARCH_PATTERN1,@SEARCH_PATTERN2,@SEARCH_PATTERN3,@SEARCH_P" & _ + "ATTERN4,@SEARCH_PATTERN5,@CONTROL_DOCTYPE_MATCH,@SQL_RIGHT_READ_AND_VIEW_ONLY,@S" & _ + "QL_RIGHT_WINDREAM_VIEW); " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEV" & _ + "EL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHE" & _ + "N, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARC" & _ + "H_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5 F" & _ + "ROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE (GUID = SCOPE_IDENTITY())" Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONSTRUCT_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CONSTRUCT_ID", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FORM_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "FORM_ID", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) @@ -6952,6 +6980,7 @@ Namespace DD_ECMAdminTableAdapters Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEARCH_PATTERN5", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "SEARCH_PATTERN5", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONTROL_DOCTYPE_MATCH", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CONTROL_DOCTYPE_MATCH", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_RIGHT_READ_AND_VIEW_ONLY", Global.System.Data.SqlDbType.VarChar, 5000, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_RIGHT_READ_AND_VIEW_ONLY", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_RIGHT_WINDREAM_VIEW", Global.System.Data.SqlDbType.VarChar, 5000, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_RIGHT_WINDREAM_VIEW", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.UpdateCommand.Connection = Me.Connection Me._adapter.UpdateCommand.CommandText = "UPDATE TBPMO_FORM_CONSTRUCTOR_DETAIL" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "SET CONSTRUCT_ID = @CO" & _ @@ -6964,7 +6993,8 @@ Namespace DD_ECMAdminTableAdapters "N3 = @SEARCH_PATTERN3, SEARCH_PATTERN4 = @SEARCH_PATTERN4, SEARCH_PATTERN5 = @SE" & _ "ARCH_PATTERN5, LOAD_DIRECT = @LOAD_DIRECT, " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & " CONTROL_DO" & _ "CTYPE_MATCH = @CONTROL_DOCTYPE_MATCH, SQL_RIGHT_READ_AND_VIEW_ONLY = @SQL_RIGHT_" & _ - "READ_AND_VIEW_ONLY" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "WHERE (GUID = @Original_GUID); " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "SELECT GUID, CONS" & _ + "READ_AND_VIEW_ONLY, " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & " SQL_RIGHT_WINDREAM_VIEW = @SQL_RI" & _ + "GHT_WINDREAM_VIEW" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "WHERE (GUID = @Original_GUID); " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "SELECT GUID, CONS" & _ "TRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SE" & _ "LECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COL" & _ "UMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, S" & _ @@ -6990,6 +7020,7 @@ Namespace DD_ECMAdminTableAdapters Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LOAD_DIRECT", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "LOAD_DIRECT", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONTROL_DOCTYPE_MATCH", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CONTROL_DOCTYPE_MATCH", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_RIGHT_READ_AND_VIEW_ONLY", Global.System.Data.SqlDbType.VarChar, 5000, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_RIGHT_READ_AND_VIEW_ONLY", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_RIGHT_WINDREAM_VIEW", Global.System.Data.SqlDbType.VarChar, 5000, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_RIGHT_WINDREAM_VIEW", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, False, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, False, Nothing, "", "", "")) End Sub @@ -7012,8 +7043,8 @@ Namespace DD_ECMAdminTableAdapters "WHEN, " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & " COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SE" & _ "ARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN" & _ "5, LOAD_DIRECT, SQL_QUICK_VIEW, " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & " CONTROL_DOCTYPE_MATCH" & _ - ", SQL_RIGHT_READ_AND_VIEW_ONLY" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "FROM TBPMO_FORM_CONSTRUCTOR_DETAIL" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "W" & _ - "HERE (GUID = @ID)" + ", SQL_RIGHT_READ_AND_VIEW_ONLY, SQL_RIGHT_WINDREAM_VIEW" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "FROM TBPMO_F" & _ + "ORM_CONSTRUCTOR_DETAIL" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "WHERE (GUID = @ID)" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) End Sub @@ -7115,7 +7146,8 @@ Namespace DD_ECMAdminTableAdapters ByVal SEARCH_PATTERN4 As String, _ ByVal SEARCH_PATTERN5 As String, _ ByVal CONTROL_DOCTYPE_MATCH As Integer, _ - ByVal SQL_RIGHT_READ_AND_VIEW_ONLY As String) As Integer + ByVal SQL_RIGHT_READ_AND_VIEW_ONLY As String, _ + ByVal SQL_RIGHT_WINDREAM_VIEW As String) As Integer Me.Adapter.InsertCommand.Parameters(0).Value = CType(CONSTRUCT_ID, Integer) Me.Adapter.InsertCommand.Parameters(1).Value = CType(FORM_ID, Integer) Me.Adapter.InsertCommand.Parameters(2).Value = CType(PARENT_ID, Integer) @@ -7182,6 +7214,11 @@ Namespace DD_ECMAdminTableAdapters Else Me.Adapter.InsertCommand.Parameters(17).Value = CType(SQL_RIGHT_READ_AND_VIEW_ONLY, String) End If + If (SQL_RIGHT_WINDREAM_VIEW Is Nothing) Then + Throw New Global.System.ArgumentNullException("SQL_RIGHT_WINDREAM_VIEW") + Else + Me.Adapter.InsertCommand.Parameters(18).Value = CType(SQL_RIGHT_WINDREAM_VIEW, String) + End If Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then @@ -7221,6 +7258,7 @@ Namespace DD_ECMAdminTableAdapters ByVal LOAD_DIRECT As Boolean, _ ByVal CONTROL_DOCTYPE_MATCH As Integer, _ ByVal SQL_RIGHT_READ_AND_VIEW_ONLY As String, _ + ByVal SQL_RIGHT_WINDREAM_VIEW As String, _ ByVal Original_GUID As Integer, _ ByVal GUID As Integer) As Integer Me.Adapter.UpdateCommand.Parameters(0).Value = CType(CONSTRUCT_ID, Integer) @@ -7290,8 +7328,13 @@ Namespace DD_ECMAdminTableAdapters Else Me.Adapter.UpdateCommand.Parameters(18).Value = CType(SQL_RIGHT_READ_AND_VIEW_ONLY, String) End If - Me.Adapter.UpdateCommand.Parameters(19).Value = CType(Original_GUID, Integer) - Me.Adapter.UpdateCommand.Parameters(20).Value = CType(GUID, Integer) + If (SQL_RIGHT_WINDREAM_VIEW Is Nothing) Then + Throw New Global.System.ArgumentNullException("SQL_RIGHT_WINDREAM_VIEW") + Else + Me.Adapter.UpdateCommand.Parameters(19).Value = CType(SQL_RIGHT_WINDREAM_VIEW, String) + End If + Me.Adapter.UpdateCommand.Parameters(20).Value = CType(Original_GUID, Integer) + Me.Adapter.UpdateCommand.Parameters(21).Value = CType(GUID, Integer) Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then diff --git a/app/DD-Record-Organiser/DD_ECMAdmin.xsd b/app/DD-Record-Organiser/DD_ECMAdmin.xsd index 7676dae..b1b447b 100644 --- a/app/DD-Record-Organiser/DD_ECMAdmin.xsd +++ b/app/DD-Record-Organiser/DD_ECMAdmin.xsd @@ -97,8 +97,8 @@ WHERE (GUID = @Original_GUID) INSERT INTO TBPMO_FORM_CONSTRUCTOR_DETAIL (CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, - SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5, CONTROL_DOCTYPE_MATCH, SQL_RIGHT_READ_AND_VIEW_ONLY) -VALUES (@CONSTRUCT_ID,@FORM_ID,@PARENT_ID,@LEVEL1_SELECT,@SEQUENCE,@SQL_SELECT_EBENE1,@SQL_SELECT_EBENE2,@ADDED_WHO,@COLUMN_NAME1,@COLUMN_NAME2,@WINDREAM_SEARCH,@SEARCH_PATTERN1,@SEARCH_PATTERN2,@SEARCH_PATTERN3,@SEARCH_PATTERN4,@SEARCH_PATTERN5,@CONTROL_DOCTYPE_MATCH,@SQL_RIGHT_READ_AND_VIEW_ONLY); + SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5, CONTROL_DOCTYPE_MATCH, SQL_RIGHT_READ_AND_VIEW_ONLY, SQL_RIGHT_WINDREAM_VIEW) +VALUES (@CONSTRUCT_ID,@FORM_ID,@PARENT_ID,@LEVEL1_SELECT,@SEQUENCE,@SQL_SELECT_EBENE1,@SQL_SELECT_EBENE2,@ADDED_WHO,@COLUMN_NAME1,@COLUMN_NAME2,@WINDREAM_SEARCH,@SEARCH_PATTERN1,@SEARCH_PATTERN2,@SEARCH_PATTERN3,@SEARCH_PATTERN4,@SEARCH_PATTERN5,@CONTROL_DOCTYPE_MATCH,@SQL_RIGHT_READ_AND_VIEW_ONLY,@SQL_RIGHT_WINDREAM_VIEW); SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5 FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE (GUID = SCOPE_IDENTITY()) @@ -119,6 +119,7 @@ SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELE + @@ -126,7 +127,7 @@ SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELE SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5, LOAD_DIRECT, SQL_QUICK_VIEW, - CONTROL_DOCTYPE_MATCH, SQL_RIGHT_READ_AND_VIEW_ONLY + CONTROL_DOCTYPE_MATCH, SQL_RIGHT_READ_AND_VIEW_ONLY, SQL_RIGHT_WINDREAM_VIEW FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE (GUID = @ID) @@ -141,8 +142,9 @@ SET CONSTRUCT_ID = @CONSTRUCT_ID, FORM_ID = @FORM_ID, PARENT_ID = SQL_SELECT_EBENE1 = @SQL_SELECT_EBENE1, SQL_SELECT_EBENE2 = @SQL_SELECT_EBENE2, CHANGED_WHO = @CHANGED_WHO, COLUMN_NAME1 = @COLUMN_NAME1, COLUMN_NAME2 = @COLUMN_NAME2, WINDREAM_SEARCH = @WINDREAM_SEARCH, SEARCH_PATTERN1 = @SEARCH_PATTERN1, SEARCH_PATTERN2 = @SEARCH_PATTERN2, SEARCH_PATTERN3 = @SEARCH_PATTERN3, SEARCH_PATTERN4 = @SEARCH_PATTERN4, SEARCH_PATTERN5 = @SEARCH_PATTERN5, LOAD_DIRECT = @LOAD_DIRECT, - CONTROL_DOCTYPE_MATCH = @CONTROL_DOCTYPE_MATCH, SQL_RIGHT_READ_AND_VIEW_ONLY = @SQL_RIGHT_READ_AND_VIEW_ONLY -WHERE (GUID = @Original_GUID); + CONTROL_DOCTYPE_MATCH = @CONTROL_DOCTYPE_MATCH, SQL_RIGHT_READ_AND_VIEW_ONLY = @SQL_RIGHT_READ_AND_VIEW_ONLY, + SQL_RIGHT_WINDREAM_VIEW = @SQL_RIGHT_WINDREAM_VIEW +WHERE (GUID = @Original_GUID); SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5 FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE (GUID = @GUID) @@ -164,6 +166,7 @@ SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELE + @@ -196,6 +199,7 @@ SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELE + @@ -358,7 +362,7 @@ ORDER BY NAME - + @@ -404,7 +408,7 @@ ORDER BY NAME - + @@ -515,10 +519,17 @@ ORDER BY NAME + + + + + + + - + @@ -591,14 +602,14 @@ ORDER BY NAME - + - + @@ -627,7 +638,7 @@ ORDER BY NAME - + @@ -639,7 +650,7 @@ ORDER BY NAME - + @@ -660,7 +671,7 @@ ORDER BY NAME - + @@ -674,7 +685,7 @@ ORDER BY NAME - + @@ -686,7 +697,7 @@ ORDER BY NAME - + @@ -727,7 +738,7 @@ ORDER BY NAME - + \ No newline at end of file diff --git a/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb b/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb index b939376..5fe9237 100644 --- a/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb +++ b/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb @@ -22,6 +22,7 @@ Partial Class frmConstructorDesigner 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim GUIDLabel As System.Windows.Forms.Label Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConstructorDesigner)) Dim FORM_TITLELabel As System.Windows.Forms.Label @@ -53,12 +54,13 @@ Partial Class frmConstructorDesigner Dim SQL_RIGHT_READ_AND_VIEW_ONLYLabel As System.Windows.Forms.Label Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim SQL_RIGHT_WINDREAM_VIEWLabel As System.Windows.Forms.Label Me.DD_ECMAdmin = New DD_Record_Organiser.DD_ECMAdmin() - Me.TBPMO_FORM_CONSTRUCTORBindingSource = New System.Windows.Forms.BindingSource() + Me.TBPMO_FORM_CONSTRUCTORBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBPMO_FORM_CONSTRUCTORTableAdapter = New DD_Record_Organiser.DD_ECMAdminTableAdapters.TBPMO_FORM_CONSTRUCTORTableAdapter() Me.TableAdapterManager = New DD_Record_Organiser.DD_ECMAdminTableAdapters.TableAdapterManager() Me.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter = New DD_Record_Organiser.DD_ECMAdminTableAdapters.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter() - Me.TBPMO_FORM_CONSTRUCTORBindingNavigator = New System.Windows.Forms.BindingNavigator() + Me.TBPMO_FORM_CONSTRUCTORBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components) Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel() Me.BindingNavigatorDeleteItem = New System.Windows.Forms.ToolStripButton() @@ -71,11 +73,11 @@ Partial Class frmConstructorDesigner Me.BindingNavigatorMoveLastItem = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorSeparator2 = New System.Windows.Forms.ToolStripSeparator() Me.TBPMO_FORM_CONSTRUCTORBindingNavigatorSaveItem = New System.Windows.Forms.ToolStripButton() - Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource = New System.Windows.Forms.BindingSource() + Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TreeViewDetails = New System.Windows.Forms.TreeView() - Me.cmstrpEntity = New System.Windows.Forms.ContextMenuStrip() + Me.cmstrpEntity = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.FormDesignerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ImageList1 = New System.Windows.Forms.ImageList() + Me.ImageList1 = New System.Windows.Forms.ImageList(Me.components) Me.CONSTRUCTOR_IDTextBox = New System.Windows.Forms.TextBox() Me.FORM_TITLETextBox = New System.Windows.Forms.TextBox() Me.SEQUENCE_MENUNumericUpDown = New System.Windows.Forms.NumericUpDown() @@ -144,7 +146,7 @@ Partial Class frmConstructorDesigner Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() Me.GridControlUserSQL = New DevExpress.XtraGrid.GridControl() - Me.TBWH_Users1BindingSource = New System.Windows.Forms.BindingSource() + Me.TBWH_Users1BindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.GridViewUserSQL = New DevExpress.XtraGrid.Views.Grid.GridView() Me.GridColumn4 = New DevExpress.XtraGrid.Columns.GridColumn() Me.GridColumn5 = New DevExpress.XtraGrid.Columns.GridColumn() @@ -160,7 +162,7 @@ Partial Class frmConstructorDesigner Me.btnAddUserSQL = New System.Windows.Forms.Button() Me.lblsaveSQLUser = New System.Windows.Forms.Label() Me.CHANGED_WHENTextBox2 = New System.Windows.Forms.TextBox() - Me.TBPMO_CONSTRUCTOR_USER_SQLBindingSource = New System.Windows.Forms.BindingSource() + Me.TBPMO_CONSTRUCTOR_USER_SQLBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet() Me.CHANGED_WHOTextBox2 = New System.Windows.Forms.TextBox() Me.ADDED_WHENTextBox2 = New System.Windows.Forms.TextBox() @@ -180,17 +182,17 @@ Partial Class frmConstructorDesigner Me.tslblSaveDetail = New System.Windows.Forms.ToolStripStatusLabel() Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() Me.tsbtnSave = New System.Windows.Forms.ToolStripButton() - Me.TBTEMP_QUICKDISPLAYBindingSource = New System.Windows.Forms.BindingSource() + Me.TBTEMP_QUICKDISPLAYBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.ListBox1 = New System.Windows.Forms.ListBox() Me.Label1 = New System.Windows.Forms.Label() - Me.TBPMO_FORM_CONSTRUCTORBindingSource1 = New System.Windows.Forms.BindingSource() + Me.TBPMO_FORM_CONSTRUCTORBindingSource1 = New System.Windows.Forms.BindingSource(Me.components) Me.TBPMO_FORM_CONSTRUCTORTableAdapter1 = New DD_Record_Organiser.DD_ECMAdminTableAdapters.TBPMO_FORM_CONSTRUCTORTableAdapter() Me.TableAdapterManager1 = New DD_Record_Organiser.DD_ECMAdminTableAdapters.TableAdapterManager() Me.lblSave = New System.Windows.Forms.Label() Me.OFDWindreamsuche = New System.Windows.Forms.OpenFileDialog() Me.TBTEMP_QUICKDISPLAYTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBTEMP_QUICKDISPLAYTableAdapter() Me.TableAdapterManager2 = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager() - Me.ImageCollection1 = New DevExpress.Utils.ImageCollection() + Me.ImageCollection1 = New DevExpress.Utils.ImageCollection(Me.components) Me.btndeleteUserConstructorRel = New System.Windows.Forms.Button() Me.btnAddUser2ConstructorREL = New System.Windows.Forms.Button() Me.ListBoxUsersFORConstructor = New System.Windows.Forms.ListBox() @@ -203,12 +205,13 @@ Partial Class frmConstructorDesigner Me.TableAdapterManager3 = New DD_Record_Organiser.DD_DMSDataSetCalendarTableAdapters.TableAdapterManager() Me.TBPMO_CONSTRUCTOR_USER_SQLTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_CONSTRUCTOR_USER_SQLTableAdapter() Me.GridControlUsers2Menue = New DevExpress.XtraGrid.GridControl() - Me.TBAD_UsersBindingSource = New System.Windows.Forms.BindingSource() + Me.TBAD_UsersBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.GridViewlUsers2Menue = New DevExpress.XtraGrid.Views.Grid.GridView() Me.colSelect = New DevExpress.XtraGrid.Columns.GridColumn() Me.GridColumn1 = New DevExpress.XtraGrid.Columns.GridColumn() Me.GridColumn2 = New DevExpress.XtraGrid.Columns.GridColumn() Me.colID = New DevExpress.XtraGrid.Columns.GridColumn() + Me.SQL_RIGHT_WINDREAM_VIEWTextBox = New System.Windows.Forms.TextBox() GUIDLabel = New System.Windows.Forms.Label() FORM_TITLELabel = New System.Windows.Forms.Label() SEQUENCE_MENULabel = New System.Windows.Forms.Label() @@ -237,6 +240,7 @@ Partial Class frmConstructorDesigner CHANGED_WHENLabel2 = New System.Windows.Forms.Label() Label19 = New System.Windows.Forms.Label() SQL_RIGHT_READ_AND_VIEW_ONLYLabel = New System.Windows.Forms.Label() + SQL_RIGHT_WINDREAM_VIEWLabel = New System.Windows.Forms.Label() CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPMO_FORM_CONSTRUCTORBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPMO_FORM_CONSTRUCTORBindingNavigator, System.ComponentModel.ISupportInitialize).BeginInit() @@ -661,6 +665,8 @@ Partial Class frmConstructorDesigner 'XtraTabPage3 ' resources.ApplyResources(Me.XtraTabPage3, "XtraTabPage3") + Me.XtraTabPage3.Controls.Add(SQL_RIGHT_WINDREAM_VIEWLabel) + Me.XtraTabPage3.Controls.Add(Me.SQL_RIGHT_WINDREAM_VIEWTextBox) Me.XtraTabPage3.Controls.Add(SQL_RIGHT_READ_AND_VIEW_ONLYLabel) Me.XtraTabPage3.Controls.Add(Me.SQL_RIGHT_READ_AND_VIEW_ONLYTextBox) Me.XtraTabPage3.Controls.Add(Me.CONTROL_DOCTYPE_MATCHTextBox) @@ -1539,6 +1545,17 @@ Partial Class frmConstructorDesigner Me.colID.FieldName = "ID" Me.colID.Name = "colID" ' + 'SQL_RIGHT_WINDREAM_VIEWLabel + ' + resources.ApplyResources(SQL_RIGHT_WINDREAM_VIEWLabel, "SQL_RIGHT_WINDREAM_VIEWLabel") + SQL_RIGHT_WINDREAM_VIEWLabel.Name = "SQL_RIGHT_WINDREAM_VIEWLabel" + ' + 'SQL_RIGHT_WINDREAM_VIEWTextBox + ' + Me.SQL_RIGHT_WINDREAM_VIEWTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource, "SQL_RIGHT_WINDREAM_VIEW", True)) + resources.ApplyResources(Me.SQL_RIGHT_WINDREAM_VIEWTextBox, "SQL_RIGHT_WINDREAM_VIEWTextBox") + Me.SQL_RIGHT_WINDREAM_VIEWTextBox.Name = "SQL_RIGHT_WINDREAM_VIEWTextBox" + ' 'frmConstructorDesigner ' resources.ApplyResources(Me, "$this") @@ -1782,4 +1799,5 @@ Partial Class frmConstructorDesigner Friend WithEvents colID1 As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents CONTROL_DOCTYPE_MATCHTextBox As System.Windows.Forms.TextBox Friend WithEvents SQL_RIGHT_READ_AND_VIEW_ONLYTextBox As System.Windows.Forms.TextBox + Friend WithEvents SQL_RIGHT_WINDREAM_VIEWTextBox As System.Windows.Forms.TextBox End Class diff --git a/app/DD-Record-Organiser/frmConstructorDesigner.resx b/app/DD-Record-Organiser/frmConstructorDesigner.resx index 0641fc2..2941c6c 100644 --- a/app/DD-Record-Organiser/frmConstructorDesigner.resx +++ b/app/DD-Record-Organiser/frmConstructorDesigner.resx @@ -380,6 +380,9 @@ True + + Tahoma, 8.25pt, style=Italic + 12, 11 @@ -402,7 +405,7 @@ XtraTabPage3 - 18 + 20 False @@ -440,8 +443,11 @@ True + + Tahoma, 8.25pt, style=Italic + - 68, 242 + 73, 293 65, 13 @@ -462,7 +468,7 @@ XtraTabPage3 - 17 + 19 False @@ -470,8 +476,11 @@ True + + Tahoma, 8.25pt, style=Italic + - 234, 242 + 239, 293 73, 13 @@ -492,7 +501,7 @@ XtraTabPage3 - 15 + 17 False @@ -500,8 +509,11 @@ True + + Tahoma, 8.25pt, style=Italic + - 400, 242 + 405, 293 77, 13 @@ -522,7 +534,7 @@ XtraTabPage3 - 13 + 15 False @@ -530,8 +542,11 @@ True + + Tahoma, 8.25pt, style=Italic + - 566, 242 + 571, 293 85, 13 @@ -552,7 +567,7 @@ XtraTabPage3 - 10 + 12 False @@ -582,7 +597,7 @@ XtraTabPage3 - 12 + 14 False @@ -612,7 +627,7 @@ XtraTabPage3 - 6 + 8 False @@ -961,7 +976,7 @@ XtraTabPage3 - 3 + 5 False @@ -973,13 +988,13 @@ 69, 127 - 243, 13 + 330, 13 55 - SQL-Command - Record and windream view only: + SQL-Command - Record and windream view only? (Result: Boolean) SQL_RIGHT_READ_AND_VIEW_ONLYLabel @@ -991,7 +1006,7 @@ XtraTabPage3 - 0 + 2 17, 17 @@ -1228,7 +1243,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABS - CQAAAk1TRnQBSQFMAgEBAgEAAawBCwGsAQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAgEAAbQBCwG0AQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -1483,6 +1498,9 @@ 16 + + Tahoma, 8.25pt, style=Italic + 15, 27 @@ -1502,7 +1520,7 @@ XtraTabPage3 - 20 + 22 72, 25 @@ -1526,7 +1544,7 @@ XtraTabPage3 - 21 + 23 9, 34 @@ -1555,92 +1573,86 @@ 15, 277 - - 914, 95 - - - 807, 95 - - - XtraTabControl2 - - - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + Fill - - XtraTabPage1 + + 292, 25 - - 0 + + True - - StatusStrip1 + + False + + + True - - System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 69, 205 - - XtraTabPage1 + + 272, 13 - - 1 + + 56 - - ToolStrip1 + + SQL-Command windream-files visible? (Result: Boolean) - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + SQL_RIGHT_WINDREAM_VIEWLabel - - XtraTabPage1 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 2 + + XtraTabPage3 - - 1300, 408 + + 0 - - Entitäten-Übersicht + + Consolas, 8.25pt - - XtraTabPage1 + + 72, 221 - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + True - - XtraTabControl1 + + 757, 69 - - 0 + + 57 - - 1306, 436 + + SQL_RIGHT_WINDREAM_VIEWTextBox - - 40 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - XtraTabControl1 + + XtraTabPage3 - - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + 1 - - $this + + Consolas, 8.25pt - - 14 + + 72, 143 - - Fill + + True - - 292, 25 + + 757, 59 - - True + + 56 SQL_RIGHT_READ_AND_VIEW_ONLYTextBox @@ -1652,7 +1664,16 @@ XtraTabPage3 - 1 + 3 + + + 475, 103 + + + 57, 21 + + + 55 CONTROL_DOCTYPE_MATCHTextBox @@ -1664,7 +1685,19 @@ XtraTabPage3 - 2 + 4 + + + 701, 25 + + + 128, 24 + + + 52 + + + Ersten Record laden LOAD_DIRECTCheckBox @@ -1676,7 +1709,25 @@ XtraTabPage3 - 4 + 6 + + + True + + + Segoe UI, 8.25pt, style=Italic + + + 189, 87 + + + 236, 13 + + + 51 + + + Dient zur Anzeige der Selektion von Datensätzen Label4 @@ -1688,7 +1739,16 @@ XtraTabPage3 - 5 + 7 + + + 72, 103 + + + 247, 21 + + + 49 COLUMN_NAME1ComboBox @@ -1700,7 +1760,25 @@ XtraTabPage3 - 7 + 9 + + + True + + + Segoe UI, 8.25pt, style=Italic + + + 189, 30 + + + 319, 13 + + + 48 + + + Kann man für diese Entität auf der ersten Ebene Daten selektieren? Label2 @@ -1712,7 +1790,19 @@ XtraTabPage3 - 8 + 10 + + + Consolas, 8.25pt + + + 72, 64 + + + 757, 20 + + + 35 SQL_SELECT_EBENE1TextBox @@ -1724,7 +1814,19 @@ XtraTabPage3 - 9 + 11 + + + Tahoma, 8.25pt, style=Italic + + + 574, 309 + + + 160, 21 + + + 47 CHANGED_WHENTextBox1 @@ -1736,7 +1838,19 @@ XtraTabPage3 - 11 + 13 + + + Tahoma, 8.25pt, style=Italic + + + 408, 309 + + + 160, 21 + + + 46 CHANGED_WHOTextBox1 @@ -1748,7 +1862,19 @@ XtraTabPage3 - 14 + 16 + + + Tahoma, 8.25pt, style=Italic + + + 242, 309 + + + 160, 21 + + + 45 ADDED_WHENTextBox1 @@ -1760,7 +1886,19 @@ XtraTabPage3 - 16 + 18 + + + Tahoma, 8.25pt, style=Italic + + + 76, 309 + + + 160, 21 + + + 44 ADDED_WHOTextBox1 @@ -1772,7 +1910,7 @@ XtraTabPage3 - 19 + 21 1002, 333 @@ -2107,332 +2245,161 @@ 2 - - btnsaddUser2Client - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage6 - - - 3 - - - Label18 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage6 - - - 4 - - - chklbxClient - - - System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage6 - - - 5 - - - 1002, 333 - - - Zuordnung Entität-Client - - - XtraTabPage6 - - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabControl2 - - - 4 - - - XtraTabControl2 - - - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabPage1 - - - 0 - - - Consolas, 8.25pt - - - 72, 143 - - - True - - - 757, 96 - - - 56 - - - SQL_RIGHT_READ_AND_VIEW_ONLYTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage3 - - - 1 - - - 475, 103 - - - 57, 21 - - - 55 - - - CONTROL_DOCTYPE_MATCHTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage3 - - - 2 - - - 701, 25 - - - 128, 24 - - - 52 - - - Ersten Record laden - - - LOAD_DIRECTCheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage3 - - - 4 - - - True - - - Segoe UI, 8.25pt, style=Italic - - - 189, 87 - - - 236, 13 - - - 51 - - - Dient zur Anzeige der Selektion von Datensätzen - - - Label4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage3 - - - 5 - - - 72, 103 - - - 247, 21 - - - 49 - - - COLUMN_NAME1ComboBox + + btnsaddUser2Client - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - XtraTabPage3 + + XtraTabPage6 - - 7 + + 3 - - True + + Label18 - - Segoe UI, 8.25pt, style=Italic + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 189, 30 + + XtraTabPage6 - - 319, 13 + + 4 - - 48 + + chklbxClient - - Kann man für diese Entität auf der ersten Ebene Daten selektieren? + + System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Label2 + + XtraTabPage6 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 5 - - XtraTabPage3 + + 1002, 333 - - 8 + + Zuordnung Entität-Client - - Consolas, 8.25pt + + XtraTabPage6 - - 72, 64 + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - 757, 20 + + XtraTabControl2 - - 35 + + 4 - - SQL_SELECT_EBENE1TextBox + + XtraTabControl2 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - XtraTabPage3 + + XtraTabPage1 - - 9 + + 0 - - 569, 258 + + 914, 95 + + + 292, 386 - - 160, 21 + + 1008, 22 - - 47 + + 35 - - CHANGED_WHENTextBox1 + + StatusStrip1 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + StatusStrip1 - - XtraTabPage3 + + System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 11 + + XtraTabPage1 - - 403, 258 + + 1 - - 160, 21 + + 807, 95 + + + 292, 0 - - 46 + + 1008, 25 - - CHANGED_WHOTextBox1 + + 34 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ToolStrip1 - - XtraTabPage3 + + ToolStrip1 - - 14 + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 237, 258 + + XtraTabPage1 - - 160, 21 + + 2 - - 45 + + 1300, 408 - - ADDED_WHENTextBox1 + + Entitäten-Übersicht - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + XtraTabPage1 - - XtraTabPage3 + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - 16 + + XtraTabControl1 - - 71, 258 + + 0 - - 160, 21 + + 1306, 436 - - 44 + + 40 - - ADDED_WHOTextBox1 + + XtraTabControl1 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - XtraTabPage3 + + $this - - 19 + + 14 @@ -4695,33 +4662,6 @@ Mandanten hinzu 5 - - 914, 95 - - - 292, 386 - - - 1008, 22 - - - 35 - - - StatusStrip1 - - - StatusStrip1 - - - System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage1 - - - 1 - 191, 17 @@ -4731,33 +4671,6 @@ Mandanten hinzu False - - 807, 95 - - - 292, 0 - - - 1008, 25 - - - 34 - - - ToolStrip1 - - - ToolStrip1 - - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage1 - - - 2 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8