diff --git a/app/DD-Record-Organizer/DD_DMSDataSet.Designer.vb b/app/DD-Record-Organizer/DD_DMSDataSet.Designer.vb index 1cb8c97..6b1c030 100644 --- a/app/DD-Record-Organizer/DD_DMSDataSet.Designer.vb +++ b/app/DD-Record-Organizer/DD_DMSDataSet.Designer.vb @@ -19851,8 +19851,9 @@ Partial Public Class DD_DMSDataSet Me.columnGUID.AllowDBNull = false Me.columnGUID.ReadOnly = true Me.columnGUID.Unique = true - Me.columnENTITY_ID.AllowDBNull = false + Me.columnENTITY_ID.DefaultValue = CType(1,Integer) Me.columnGROUP_ID.AllowDBNull = false + Me.columnGROUP_ID.DefaultValue = CType(1,Integer) Me.columnEDIT_REC.AllowDBNull = false Me.columnEDIT_REC.DefaultValue = CType(true,Boolean) Me.columnADD_REC.AllowDBNull = false @@ -32712,7 +32713,11 @@ Partial Public Class DD_DMSDataSet Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Property ENTITY_ID() As Integer Get - Return CType(Me(Me.tableTBPMO_RIGHT_GROUP.ENTITY_IDColumn),Integer) + Try + Return CType(Me(Me.tableTBPMO_RIGHT_GROUP.ENTITY_IDColumn),Integer) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ENTITY_ID in Tabelle TBPMO_RIGHT_GROUP ist DBNull.", e) + End Try End Get Set Me(Me.tableTBPMO_RIGHT_GROUP.ENTITY_IDColumn) = value @@ -32878,6 +32883,18 @@ Partial Public Class DD_DMSDataSet End Set End Property + _ + Public Function IsENTITY_IDNull() As Boolean + Return Me.IsNull(Me.tableTBPMO_RIGHT_GROUP.ENTITY_IDColumn) + End Function + + _ + Public Sub SetENTITY_IDNull() + Me(Me.tableTBPMO_RIGHT_GROUP.ENTITY_IDColumn) = Global.System.Convert.DBNull + End Sub + _ Public Function IsADDED_WHONull() As Boolean @@ -51374,8 +51391,12 @@ Namespace DD_DMSDataSetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Insert, true)> _ - Public Overloads Overridable Function Insert(ByVal ENTITY_ID As Integer, ByVal GROUP_ID As Integer, ByVal EDIT_REC As Boolean, ByVal ADD_REC As Boolean, ByVal DELETE_REC As Boolean, ByVal ADD_DOC As Boolean, ByVal VIEW_DOC As Boolean, ByVal DELETE_DOC As Boolean, ByVal ADDED_WHO As String) As Integer - Me.Adapter.InsertCommand.Parameters(0).Value = CType(ENTITY_ID,Integer) + Public Overloads Overridable Function Insert(ByVal ENTITY_ID As Global.System.Nullable(Of Integer), ByVal GROUP_ID As Integer, ByVal EDIT_REC As Boolean, ByVal ADD_REC As Boolean, ByVal DELETE_REC As Boolean, ByVal ADD_DOC As Boolean, ByVal VIEW_DOC As Boolean, ByVal DELETE_DOC As Boolean, ByVal ADDED_WHO As String) As Integer + If (ENTITY_ID.HasValue = true) Then + Me.Adapter.InsertCommand.Parameters(0).Value = CType(ENTITY_ID.Value,Integer) + Else + Me.Adapter.InsertCommand.Parameters(0).Value = Global.System.DBNull.Value + End If Me.Adapter.InsertCommand.Parameters(1).Value = CType(GROUP_ID,Integer) Me.Adapter.InsertCommand.Parameters(2).Value = CType(EDIT_REC,Boolean) Me.Adapter.InsertCommand.Parameters(3).Value = CType(ADD_REC,Boolean) @@ -51407,8 +51428,12 @@ Namespace DD_DMSDataSetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Update, true)> _ - Public Overloads Overridable Function Update(ByVal ENTITY_ID As Integer, ByVal GROUP_ID As Integer, ByVal EDIT_REC As Boolean, ByVal ADD_REC As Boolean, ByVal DELETE_REC As Boolean, ByVal ADD_DOC As Boolean, ByVal VIEW_DOC As Boolean, ByVal DELETE_DOC As Boolean, ByVal CHANGED_WHO As String, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer - Me.Adapter.UpdateCommand.Parameters(0).Value = CType(ENTITY_ID,Integer) + Public Overloads Overridable Function Update(ByVal ENTITY_ID As Global.System.Nullable(Of Integer), ByVal GROUP_ID As Integer, ByVal EDIT_REC As Boolean, ByVal ADD_REC As Boolean, ByVal DELETE_REC As Boolean, ByVal ADD_DOC As Boolean, ByVal VIEW_DOC As Boolean, ByVal DELETE_DOC As Boolean, ByVal CHANGED_WHO As String, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer + If (ENTITY_ID.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(0).Value = CType(ENTITY_ID.Value,Integer) + Else + Me.Adapter.UpdateCommand.Parameters(0).Value = Global.System.DBNull.Value + End If Me.Adapter.UpdateCommand.Parameters(1).Value = CType(GROUP_ID,Integer) Me.Adapter.UpdateCommand.Parameters(2).Value = CType(EDIT_REC,Boolean) Me.Adapter.UpdateCommand.Parameters(3).Value = CType(ADD_REC,Boolean) diff --git a/app/DD-Record-Organizer/DD_DMSDataSet.xsc b/app/DD-Record-Organizer/DD_DMSDataSet.xsc index ed52a31..cd48c1d 100644 --- a/app/DD-Record-Organizer/DD_DMSDataSet.xsc +++ b/app/DD-Record-Organizer/DD_DMSDataSet.xsc @@ -358,7 +358,7 @@ - + @@ -367,10 +367,10 @@ - + - + @@ -390,5 +390,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/DD-Record-Organizer/DD_DMSDataSet.xsd b/app/DD-Record-Organizer/DD_DMSDataSet.xsd index 84da4d0..0a275be 100644 --- a/app/DD-Record-Organizer/DD_DMSDataSet.xsd +++ b/app/DD-Record-Organizer/DD_DMSDataSet.xsd @@ -2997,7 +2997,7 @@ WHERE (GUID = @Original_GUID) VALUES (@ENTITY_ID,@GROUP_ID,@EDIT_REC,@ADD_REC,@DELETE_REC,@ADD_DOC,@VIEW_DOC,@DELETE_DOC,@ADDED_WHO); SELECT GUID, ENTITY_ID, GROUP_ID, EDIT_REC, ADD_REC, DELETE_REC, ADD_DOC, VIEW_DOC, DELETE_DOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_RIGHT_GROUP WHERE (GUID = SCOPE_IDENTITY()) - + @@ -3024,7 +3024,7 @@ SET ENTITY_ID = @ENTITY_ID, GROUP_ID = @GROUP_ID, EDIT_REC = @EDI WHERE (GUID = @Original_GUID); SELECT GUID, ENTITY_ID, GROUP_ID, EDIT_REC, ADD_REC, DELETE_REC, ADD_DOC, VIEW_DOC, DELETE_DOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_RIGHT_GROUP WHERE (GUID = @GUID) - + @@ -4545,10 +4545,10 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - - - - + + + + @@ -5743,8 +5743,8 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - - + + @@ -6238,27 +6238,27 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/DD-Record-Organizer/DD_DMSDataSet.xss b/app/DD-Record-Organizer/DD_DMSDataSet.xss index e8c8b2a..3653b0c 100644 --- a/app/DD-Record-Organizer/DD_DMSDataSet.xss +++ b/app/DD-Record-Organizer/DD_DMSDataSet.xss @@ -4,59 +4,59 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - + + - + - + - + - + - - - + + + - + - + - + - - - - - - - - - - + + + + + + + + + + @@ -291,47 +291,39 @@ - + - 22 - 0 + 389 + 517 - 22 - -30 + 172 + 517 - 22 - -30 - - - 22 - 0 + 172 + 509 - + - 14 - 0 + 859 + 122 - 14 - -30 + 859 + 336 - 14 - -30 - - - 14 - 0 + 189 + 336 - + 389 @@ -347,7 +339,7 @@ - + 158 @@ -367,7 +359,7 @@ - + 961 diff --git a/app/DD-Record-Organizer/frmConstructor_Main.resx b/app/DD-Record-Organizer/frmConstructor_Main.resx index 7f751ed..67e7727 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.resx +++ b/app/DD-Record-Organizer/frmConstructor_Main.resx @@ -146,7 +146,7 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vQAADr0BR/uQrQAAAMpJREFUSEu9lUEOwyAMBHlS38Dj+GafkPbC1WWRRY1qEhtCV1opCngmJIcEIgo5 + vAAADrwBlbxySQAAAMpJREFUSEu9lUEOwyAMBHlS38Dj+GafkPbC1WWRRY1qEhtCV1opCngmJIcEIgo5 Z9IaHNHm0SaIMXati44MGVLwOt61bdGRIeOvAlmroOx7cHXGykcuewA+uDoDgpmU4QpPKRFarp+4x8vf zAgkHK+CBTjFusAFRzwCNxyxCqbgiEUwDUeuBEtw5EywDEdGglvgiCa4DY5cCZbgCARlGBCtAJvgYqZr E+BVyPIGnMT05CNGJ9j+P9gukJ0V/DDOPjLPmqLNo1WwrxQ+GCNWVrb1cMEAAAAASUVORK5CYII= @@ -247,7 +247,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vQAADr0BR/uQrQAAAG1JREFUOE+1kdEJgDAMRDtbhssa3TK/0ZSIxV5Co3jwUI7LA7Gp6idgWQGWFWBZ + vAAADrwBlbxySQAAAG1JREFUOE+1kdEJgDAMRDtbhssa3TK/0ZSIxV5Co3jwUI7LA7Gp6idgWQGWFWBZ 4X7xiEg/UUD3yUgosNjYjphZiWg8n5JF4IOFSAIFNsyYJf8IENufMMdG2bElFFzHgPw3vgWWFWBZAZb7 aDsAn1PBeUq8SBsAAAAASUVORK5CYII= @@ -261,7 +261,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vQAADr0BR/uQrQAAAJVJREFUOE+lkdEJxDAMQztbhssat2V+fZWxD1vKR8IZBLX8JEr7mNlf2po3UiNm + vAAADrwBlbxySQAAAJVJREFUOE+lkdEJxDAMQztbhssat2V+fZWxD1vKR8IZBLX8JEr7mNlf2po3UiNm rWVVYSsvRgxCYwzXVcELfwDuCnBjvi0QYIBckB7zbYECdlGBi/m2QIDmnFKQHvNtgTKIQBbk83FBDdeS 0wL/WPwG8HBjvi1uxO/KkhrGTXgxYrKkhjHCi1EmSn5hjPBs3GprnsueLz0XwXnZAqB7AAAAAElFTkSu QmCC @@ -276,7 +276,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vQAADr0BR/uQrQAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn + vAAADrwBlbxySQAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn yJTAzC72CM5PTBUwfXMT8OiJnwuYOmL6ZhBwlCBPkT2CSp4iUvAGWa4gy3nQDiNEflNl/3oXAAAAAElF TkSuQmCC @@ -496,7 +496,7 @@ 0, 0 - 908, 237 + 910, 237 2 @@ -592,7 +592,7 @@ 0, 0 - 699, 231 + 699, 223 4 @@ -634,7 +634,7 @@ 0, 0 - 486, 206 + 488, 198 5 @@ -681,10 +681,10 @@ Ansicht eingeschränkt - Klick Bearbeiten für Entsperren - 0, 206 + 0, 198 - 486, 25 + 488, 25 0 @@ -720,7 +720,7 @@ 1 - 1201, 235 + 1201, 227 1 @@ -896,7 +896,7 @@ 1 - 1201, 262 + 1201, 254 Detailansicht @@ -914,7 +914,7 @@ 0 - 1203, 290 + 1203, 282 3 @@ -926,7 +926,7 @@ 0, 27 - 1201, 225 + 1201, 237 0 @@ -952,7 +952,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vQAADr0BR/uQrQAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn + vAAADrwBlbxySQAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn yJTAzC72CM5PTBUwfXMT8OiJnwuYOmL6ZhBwlCBPkT2CSp4iUvAGWa4gy3nQDiNEflNl/3oXAAAAAElF TkSuQmCC @@ -1093,7 +1093,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vQAADr0BR/uQrQAAAUlJREFUOE+lU6GOg1AQ5BP6Cf2E+4QLnqQWV4EHjUJhGzxJJbICDxpFQvCHg4DA + vAAADrwBlbxySQAAAUlJREFUOE+lU6GOg1AQ5BP6Cf2E+4QLnqQWV4EHjUJhGzxJJbICDxpFQvCHg4DA Yd/tLPvK4wJ34iaZ9GVndxh4WwtYluVCfBIVcSYGLPwA1SPp0bxpIaiqSjmOw2zbdhMJdL4S6yzLlG3b qigK6JHI3FCmacoi6HmeGscRSZAswDmOY9bQR7WXjK5AExJoAzBJEjTOXdexIWowoVpNvMjoChQg5Hm+ M8HT8Eo4G6muMrbHmQkIk2ma8PRPaT8G3Ikc1TSAKdWf0nYMGT5M4Lrun/E/iDM+nDlofgPf9/kDysgG @@ -1183,7 +1183,7 @@ - 1201, 252 + 1201, 264 Positionen @@ -1239,7 +1239,7 @@ 0, 0 - 1201, 262 + 1201, 264 7 @@ -1257,7 +1257,7 @@ 0 - 1201, 262 + 1201, 264 Dateien @@ -1688,7 +1688,7 @@ 2 - 1201, 252 + 1201, 264 Wiedervorlage @@ -1790,7 +1790,7 @@ 5 - 1201, 225 + 1201, 237 90 @@ -1862,7 +1862,7 @@ 1 - 1201, 252 + 1201, 264 Vorgängervarianten @@ -1889,7 +1889,7 @@ 0, 0 - 1201, 252 + 1201, 254 301, 17 @@ -1918,7 +1918,7 @@ 0 - 1201, 252 + 1201, 254 NodeNavigation(beta) @@ -1963,7 +1963,7 @@ 1 - 1203, 539 + 1203, 529 2 @@ -1987,7 +1987,7 @@ Fill - 0, 147 + 0, 158 Panel1 @@ -2020,7 +2020,7 @@ 1 - 1203, 539 + 1203, 529 4 @@ -3085,13 +3085,13 @@ Funktionen - 1203, 147 + 1203, 158 - 0, 686 + 0, 687 - 1203, 23 + 1203, 22 RibbonStatusBar1 diff --git a/app/DD-Record-Organizer/frmDoc_Links.Designer.vb b/app/DD-Record-Organizer/frmDoc_Links.Designer.vb index b30d4b4..08c415b 100644 --- a/app/DD-Record-Organizer/frmDoc_Links.Designer.vb +++ b/app/DD-Record-Organizer/frmDoc_Links.Designer.vb @@ -24,7 +24,6 @@ Partial Class frmDoc_Links Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmDoc_Links)) - Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() Me.GridControlRecords = New DevExpress.XtraGrid.GridControl() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.OrdnerÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -37,17 +36,13 @@ Partial Class frmDoc_Links Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.bsiSource = New DevExpress.XtraBars.BarStaticItem() CType(Me.GridControlRecords, System.ComponentModel.ISupportInitialize).BeginInit() Me.ContextMenuStrip1.SuspendLayout() CType(Me.grvwGrid, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' - 'StatusStrip1 - ' - resources.ApplyResources(Me.StatusStrip1, "StatusStrip1") - Me.StatusStrip1.Name = "StatusStrip1" - ' 'GridControlRecords ' Me.GridControlRecords.ContextMenuStrip = Me.ContextMenuStrip1 @@ -97,9 +92,9 @@ Partial Class frmDoc_Links 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtnitmdeletelink, Me.BarStaticItemStatus, Me.BarButtonItem2}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtnitmdeletelink, Me.BarStaticItemStatus, Me.BarButtonItem2, Me.bsiSource}) resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") - Me.RibbonControl1.MaxItemId = 4 + Me.RibbonControl1.MaxItemId = 5 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] @@ -142,6 +137,7 @@ Partial Class frmDoc_Links 'RibbonStatusBar1 ' Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticItemStatus) + Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiSource) resources.ApplyResources(Me.RibbonStatusBar1, "RibbonStatusBar1") Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 @@ -151,12 +147,18 @@ Partial Class frmDoc_Links Me.RibbonPage2.Name = "RibbonPage2" resources.ApplyResources(Me.RibbonPage2, "RibbonPage2") ' + 'bsiSource + ' + Me.bsiSource.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right + resources.ApplyResources(Me.bsiSource, "bsiSource") + Me.bsiSource.Id = 4 + Me.bsiSource.Name = "bsiSource" + ' 'frmDoc_Links ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.Controls.Add(Me.GridControlRecords) - Me.Controls.Add(Me.StatusStrip1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) Me.IconOptions.Icon = CType(resources.GetObject("frmDoc_Links.IconOptions.Icon"), System.Drawing.Icon) @@ -171,7 +173,6 @@ Partial Class frmDoc_Links Me.PerformLayout() End Sub - Friend WithEvents StatusStrip1 As StatusStrip Friend WithEvents GridControlRecords As DevExpress.XtraGrid.GridControl Friend WithEvents grvwGrid As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl @@ -184,4 +185,5 @@ Partial Class frmDoc_Links Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem Friend WithEvents ContextMenuStrip1 As ContextMenuStrip Friend WithEvents OrdnerÖffnenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents bsiSource As DevExpress.XtraBars.BarStaticItem End Class diff --git a/app/DD-Record-Organizer/frmDoc_Links.resx b/app/DD-Record-Organizer/frmDoc_Links.resx index 41941ea..dc76299 100644 --- a/app/DD-Record-Organizer/frmDoc_Links.resx +++ b/app/DD-Record-Organizer/frmDoc_Links.resx @@ -117,38 +117,10 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 124, 17 - - - - 0, 405 - - - 800, 22 - - - - 1 - - - StatusStrip1 - - - StatusStrip1 - - - System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - 241, 17 + 149, 22 @@ -169,11 +141,12 @@ Fill - 0, 147 + 0, 158 - 800, 258 + 800, 270 + 16 @@ -240,6 +213,9 @@ cmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + + Source: VWPMO_CUST_DOC_OBJECT_LINKS + 0, 0 @@ -250,13 +226,13 @@ Doc-Links - 800, 147 + 800, 158 - 0, 427 + 0, 428 - 800, 23 + 800, 22 RibbonStatusBar1 @@ -268,7 +244,7 @@ $this - 3 + 2 RibbonControl1 @@ -280,7 +256,7 @@ $this - 4 + 3 RibbonPage2 @@ -518,6 +494,12 @@ DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + bsiSource + + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + frmDoc_Links diff --git a/app/DD-Record-Organizer/frmDoc_Links.vb b/app/DD-Record-Organizer/frmDoc_Links.vb index 0a01a88..a313650 100644 --- a/app/DD-Record-Organizer/frmDoc_Links.vb +++ b/app/DD-Record-Organizer/frmDoc_Links.vb @@ -5,7 +5,11 @@ Imports DevExpress.XtraPrinting Public Class frmDoc_Links Private Sub frmDoc_DocLinks_Load(sender As Object, e As EventArgs) Handles Me.Load Try - + If USER_IS_ADMIN Then + bsiSource.Visibility = DevExpress.XtraBars.BarItemVisibility.Always + Else + bsiSource.Visibility = DevExpress.XtraBars.BarItemVisibility.Never + End If Refresh_Grid_Data() If ClassWindreamDocGrid.DT_RESULTFILES.Rows.Count = 1 Then Me.Text = $"Document-Links for file: {ClassWindreamDocGrid.DT_RESULTFILES.Rows(0).Item("DOC_PATH")}" diff --git a/app/DD-Record-Organizer/frmRight_Management.Designer.vb b/app/DD-Record-Organizer/frmRight_Management.Designer.vb index 05caab9..a44b762 100644 --- a/app/DD-Record-Organizer/frmRight_Management.Designer.vb +++ b/app/DD-Record-Organizer/frmRight_Management.Designer.vb @@ -25,6 +25,13 @@ Partial Class frmRight_Management Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmRight_Management)) Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim GUIDLabel As System.Windows.Forms.Label + Dim ENTITY_IDLabel As System.Windows.Forms.Label + Dim GROUP_IDLabel As System.Windows.Forms.Label + Dim ADDED_WHOLabel As System.Windows.Forms.Label + Dim ADDED_WHENLabel As System.Windows.Forms.Label + Dim CHANGED_WHOLabel As System.Windows.Forms.Label + Dim CHANGED_WHENLabel As System.Windows.Forms.Label Me.BindingNavigator1 = New System.Windows.Forms.BindingNavigator(Me.components) Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton() Me.TBPMO_RIGHT_GROUPBindingSource = New System.Windows.Forms.BindingSource(Me.components) @@ -42,8 +49,22 @@ Partial Class frmRight_Management Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton() Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton() Me.TBPMO_RIGHT_GROUPDataGridView = New System.Windows.Forms.DataGridView() + Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewComboBoxColumn() Me.TBWH_ENTITIESBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.DD_ECMAdmin = New DD_Record_Organizer.DD_ECMAdmin() + Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewComboBoxColumn() + Me.TBDD_GROUPSBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.DataGridViewCheckBoxColumn1 = New System.Windows.Forms.DataGridViewCheckBoxColumn() + Me.DataGridViewCheckBoxColumn2 = New System.Windows.Forms.DataGridViewCheckBoxColumn() + Me.DataGridViewCheckBoxColumn3 = New System.Windows.Forms.DataGridViewCheckBoxColumn() + Me.DataGridViewCheckBoxColumn4 = New System.Windows.Forms.DataGridViewCheckBoxColumn() + Me.DataGridViewCheckBoxColumn5 = New System.Windows.Forms.DataGridViewCheckBoxColumn() + Me.DataGridViewCheckBoxColumn6 = New System.Windows.Forms.DataGridViewCheckBoxColumn() + Me.DataGridViewTextBoxColumn4 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.DataGridViewTextBoxColumn5 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.DataGridViewTextBoxColumn6 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.DataGridViewTextBoxColumn7 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.TBDD_USER_GROUPSBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() Me.tschangedlabel = New System.Windows.Forms.ToolStripStatusLabel() @@ -103,21 +124,27 @@ Partial Class frmRight_Management Me.TBPMO_RIGHT_GROUPTableAdapter = New DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBPMO_RIGHT_GROUPTableAdapter() Me.TBDD_USERTableAdapter = New DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBDD_USERTableAdapter() Me.USER_RIGHTSTableAdapter = New DD_Record_Organizer.DD_ECMAdminTableAdapters.USER_RIGHTSTableAdapter() - Me.TBDD_GROUPSBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBDD_GROUPSTableAdapter = New DD_Record_Organizer.DD_ECMAdminTableAdapters.TBDD_GROUPSTableAdapter() - Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewComboBoxColumn() - Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewComboBoxColumn() - Me.DataGridViewCheckBoxColumn1 = New System.Windows.Forms.DataGridViewCheckBoxColumn() - Me.DataGridViewCheckBoxColumn2 = New System.Windows.Forms.DataGridViewCheckBoxColumn() - Me.DataGridViewCheckBoxColumn3 = New System.Windows.Forms.DataGridViewCheckBoxColumn() - Me.DataGridViewCheckBoxColumn4 = New System.Windows.Forms.DataGridViewCheckBoxColumn() - Me.DataGridViewCheckBoxColumn5 = New System.Windows.Forms.DataGridViewCheckBoxColumn() - Me.DataGridViewCheckBoxColumn6 = New System.Windows.Forms.DataGridViewCheckBoxColumn() - Me.DataGridViewTextBoxColumn4 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.DataGridViewTextBoxColumn5 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.DataGridViewTextBoxColumn6 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.DataGridViewTextBoxColumn7 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.GUIDTextBox = New System.Windows.Forms.TextBox() + Me.ENTITY_IDComboBox = New System.Windows.Forms.ComboBox() + Me.GROUP_IDComboBox = New System.Windows.Forms.ComboBox() + Me.EDIT_RECCheckBox = New System.Windows.Forms.CheckBox() + Me.ADD_RECCheckBox = New System.Windows.Forms.CheckBox() + Me.DELETE_RECCheckBox = New System.Windows.Forms.CheckBox() + Me.ADD_DOCCheckBox = New System.Windows.Forms.CheckBox() + Me.VIEW_DOCCheckBox = New System.Windows.Forms.CheckBox() + Me.DELETE_DOCCheckBox = New System.Windows.Forms.CheckBox() + Me.ADDED_WHOTextBox = New System.Windows.Forms.TextBox() + Me.ADDED_WHENTextBox = New System.Windows.Forms.TextBox() + Me.CHANGED_WHOTextBox = New System.Windows.Forms.TextBox() + Me.CHANGED_WHENTextBox = New System.Windows.Forms.TextBox() + GUIDLabel = New System.Windows.Forms.Label() + ENTITY_IDLabel = New System.Windows.Forms.Label() + GROUP_IDLabel = New System.Windows.Forms.Label() + ADDED_WHOLabel = New System.Windows.Forms.Label() + ADDED_WHENLabel = New System.Windows.Forms.Label() + CHANGED_WHOLabel = New System.Windows.Forms.Label() + CHANGED_WHENLabel = New System.Windows.Forms.Label() CType(Me.BindingNavigator1, System.ComponentModel.ISupportInitialize).BeginInit() Me.BindingNavigator1.SuspendLayout() CType(Me.TBPMO_RIGHT_GROUPBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() @@ -125,6 +152,7 @@ Partial Class frmRight_Management CType(Me.TBPMO_RIGHT_GROUPDataGridView, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBWH_ENTITIESBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TBDD_GROUPSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBDD_USER_GROUPSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() Me.StatusStrip1.SuspendLayout() Me.TabControl1.SuspendLayout() @@ -140,7 +168,6 @@ Partial Class frmRight_Management CType(Me.USER_RIGHTSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBDD_USERBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBWH_USER_GROUPSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TBDD_GROUPSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'BindingNavigator1 @@ -246,6 +273,8 @@ Partial Class frmRight_Management ' 'TBPMO_RIGHT_GROUPDataGridView ' + Me.TBPMO_RIGHT_GROUPDataGridView.AllowUserToAddRows = False + Me.TBPMO_RIGHT_GROUPDataGridView.AllowUserToDeleteRows = False DataGridViewCellStyle1.BackColor = System.Drawing.Color.Lime Me.TBPMO_RIGHT_GROUPDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 resources.ApplyResources(Me.TBPMO_RIGHT_GROUPDataGridView, "TBPMO_RIGHT_GROUPDataGridView") @@ -254,6 +283,26 @@ Partial Class frmRight_Management Me.TBPMO_RIGHT_GROUPDataGridView.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn1, Me.DataGridViewTextBoxColumn2, Me.DataGridViewTextBoxColumn3, Me.DataGridViewCheckBoxColumn1, Me.DataGridViewCheckBoxColumn2, Me.DataGridViewCheckBoxColumn3, Me.DataGridViewCheckBoxColumn4, Me.DataGridViewCheckBoxColumn5, Me.DataGridViewCheckBoxColumn6, Me.DataGridViewTextBoxColumn4, Me.DataGridViewTextBoxColumn5, Me.DataGridViewTextBoxColumn6, Me.DataGridViewTextBoxColumn7}) Me.TBPMO_RIGHT_GROUPDataGridView.DataSource = Me.TBPMO_RIGHT_GROUPBindingSource Me.TBPMO_RIGHT_GROUPDataGridView.Name = "TBPMO_RIGHT_GROUPDataGridView" + Me.TBPMO_RIGHT_GROUPDataGridView.ReadOnly = True + ' + 'DataGridViewTextBoxColumn1 + ' + Me.DataGridViewTextBoxColumn1.DataPropertyName = "GUID" + resources.ApplyResources(Me.DataGridViewTextBoxColumn1, "DataGridViewTextBoxColumn1") + Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1" + Me.DataGridViewTextBoxColumn1.ReadOnly = True + ' + 'DataGridViewTextBoxColumn2 + ' + Me.DataGridViewTextBoxColumn2.DataPropertyName = "ENTITY_ID" + Me.DataGridViewTextBoxColumn2.DataSource = Me.TBWH_ENTITIESBindingSource + Me.DataGridViewTextBoxColumn2.DisplayMember = "CAPTION" + resources.ApplyResources(Me.DataGridViewTextBoxColumn2, "DataGridViewTextBoxColumn2") + Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" + Me.DataGridViewTextBoxColumn2.ReadOnly = True + Me.DataGridViewTextBoxColumn2.Resizable = System.Windows.Forms.DataGridViewTriState.[True] + Me.DataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic + Me.DataGridViewTextBoxColumn2.ValueMember = "GUID" ' 'TBWH_ENTITIESBindingSource ' @@ -265,6 +314,93 @@ Partial Class frmRight_Management Me.DD_ECMAdmin.DataSetName = "DD_ECMAdmin" Me.DD_ECMAdmin.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema ' + 'DataGridViewTextBoxColumn3 + ' + Me.DataGridViewTextBoxColumn3.DataPropertyName = "GROUP_ID" + Me.DataGridViewTextBoxColumn3.DataSource = Me.TBDD_GROUPSBindingSource + Me.DataGridViewTextBoxColumn3.DisplayMember = "NAME" + resources.ApplyResources(Me.DataGridViewTextBoxColumn3, "DataGridViewTextBoxColumn3") + Me.DataGridViewTextBoxColumn3.Name = "DataGridViewTextBoxColumn3" + Me.DataGridViewTextBoxColumn3.ReadOnly = True + Me.DataGridViewTextBoxColumn3.Resizable = System.Windows.Forms.DataGridViewTriState.[True] + Me.DataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic + Me.DataGridViewTextBoxColumn3.ValueMember = "GUID" + ' + 'TBDD_GROUPSBindingSource + ' + Me.TBDD_GROUPSBindingSource.DataMember = "TBDD_GROUPS" + Me.TBDD_GROUPSBindingSource.DataSource = Me.DD_ECMAdmin + ' + 'DataGridViewCheckBoxColumn1 + ' + Me.DataGridViewCheckBoxColumn1.DataPropertyName = "EDIT_REC" + resources.ApplyResources(Me.DataGridViewCheckBoxColumn1, "DataGridViewCheckBoxColumn1") + Me.DataGridViewCheckBoxColumn1.Name = "DataGridViewCheckBoxColumn1" + Me.DataGridViewCheckBoxColumn1.ReadOnly = True + ' + 'DataGridViewCheckBoxColumn2 + ' + Me.DataGridViewCheckBoxColumn2.DataPropertyName = "ADD_REC" + resources.ApplyResources(Me.DataGridViewCheckBoxColumn2, "DataGridViewCheckBoxColumn2") + Me.DataGridViewCheckBoxColumn2.Name = "DataGridViewCheckBoxColumn2" + Me.DataGridViewCheckBoxColumn2.ReadOnly = True + ' + 'DataGridViewCheckBoxColumn3 + ' + Me.DataGridViewCheckBoxColumn3.DataPropertyName = "DELETE_REC" + resources.ApplyResources(Me.DataGridViewCheckBoxColumn3, "DataGridViewCheckBoxColumn3") + Me.DataGridViewCheckBoxColumn3.Name = "DataGridViewCheckBoxColumn3" + Me.DataGridViewCheckBoxColumn3.ReadOnly = True + ' + 'DataGridViewCheckBoxColumn4 + ' + Me.DataGridViewCheckBoxColumn4.DataPropertyName = "ADD_DOC" + resources.ApplyResources(Me.DataGridViewCheckBoxColumn4, "DataGridViewCheckBoxColumn4") + Me.DataGridViewCheckBoxColumn4.Name = "DataGridViewCheckBoxColumn4" + Me.DataGridViewCheckBoxColumn4.ReadOnly = True + ' + 'DataGridViewCheckBoxColumn5 + ' + Me.DataGridViewCheckBoxColumn5.DataPropertyName = "VIEW_DOC" + resources.ApplyResources(Me.DataGridViewCheckBoxColumn5, "DataGridViewCheckBoxColumn5") + Me.DataGridViewCheckBoxColumn5.Name = "DataGridViewCheckBoxColumn5" + Me.DataGridViewCheckBoxColumn5.ReadOnly = True + ' + 'DataGridViewCheckBoxColumn6 + ' + Me.DataGridViewCheckBoxColumn6.DataPropertyName = "DELETE_DOC" + resources.ApplyResources(Me.DataGridViewCheckBoxColumn6, "DataGridViewCheckBoxColumn6") + Me.DataGridViewCheckBoxColumn6.Name = "DataGridViewCheckBoxColumn6" + Me.DataGridViewCheckBoxColumn6.ReadOnly = True + ' + 'DataGridViewTextBoxColumn4 + ' + Me.DataGridViewTextBoxColumn4.DataPropertyName = "ADDED_WHO" + resources.ApplyResources(Me.DataGridViewTextBoxColumn4, "DataGridViewTextBoxColumn4") + Me.DataGridViewTextBoxColumn4.Name = "DataGridViewTextBoxColumn4" + Me.DataGridViewTextBoxColumn4.ReadOnly = True + ' + 'DataGridViewTextBoxColumn5 + ' + Me.DataGridViewTextBoxColumn5.DataPropertyName = "ADDED_WHEN" + resources.ApplyResources(Me.DataGridViewTextBoxColumn5, "DataGridViewTextBoxColumn5") + Me.DataGridViewTextBoxColumn5.Name = "DataGridViewTextBoxColumn5" + Me.DataGridViewTextBoxColumn5.ReadOnly = True + ' + 'DataGridViewTextBoxColumn6 + ' + Me.DataGridViewTextBoxColumn6.DataPropertyName = "CHANGED_WHO" + resources.ApplyResources(Me.DataGridViewTextBoxColumn6, "DataGridViewTextBoxColumn6") + Me.DataGridViewTextBoxColumn6.Name = "DataGridViewTextBoxColumn6" + Me.DataGridViewTextBoxColumn6.ReadOnly = True + ' + 'DataGridViewTextBoxColumn7 + ' + Me.DataGridViewTextBoxColumn7.DataPropertyName = "CHANGED_WHEN" + resources.ApplyResources(Me.DataGridViewTextBoxColumn7, "DataGridViewTextBoxColumn7") + Me.DataGridViewTextBoxColumn7.Name = "DataGridViewTextBoxColumn7" + Me.DataGridViewTextBoxColumn7.ReadOnly = True + ' 'TBDD_USER_GROUPSBindingSource ' Me.TBDD_USER_GROUPSBindingSource.DataMember = "TBDD_USER_GROUPS" @@ -298,6 +434,26 @@ Partial Class frmRight_Management 'TabPage1 ' resources.ApplyResources(Me.TabPage1, "TabPage1") + Me.TabPage1.Controls.Add(CHANGED_WHENLabel) + Me.TabPage1.Controls.Add(Me.CHANGED_WHENTextBox) + Me.TabPage1.Controls.Add(CHANGED_WHOLabel) + Me.TabPage1.Controls.Add(Me.CHANGED_WHOTextBox) + Me.TabPage1.Controls.Add(ADDED_WHENLabel) + Me.TabPage1.Controls.Add(Me.ADDED_WHENTextBox) + Me.TabPage1.Controls.Add(ADDED_WHOLabel) + Me.TabPage1.Controls.Add(Me.ADDED_WHOTextBox) + Me.TabPage1.Controls.Add(Me.DELETE_DOCCheckBox) + Me.TabPage1.Controls.Add(Me.VIEW_DOCCheckBox) + Me.TabPage1.Controls.Add(Me.ADD_DOCCheckBox) + Me.TabPage1.Controls.Add(Me.DELETE_RECCheckBox) + Me.TabPage1.Controls.Add(Me.ADD_RECCheckBox) + Me.TabPage1.Controls.Add(Me.EDIT_RECCheckBox) + Me.TabPage1.Controls.Add(GROUP_IDLabel) + Me.TabPage1.Controls.Add(Me.GROUP_IDComboBox) + Me.TabPage1.Controls.Add(ENTITY_IDLabel) + Me.TabPage1.Controls.Add(Me.ENTITY_IDComboBox) + Me.TabPage1.Controls.Add(GUIDLabel) + Me.TabPage1.Controls.Add(Me.GUIDTextBox) Me.TabPage1.Controls.Add(Me.BindingNavigator1) Me.TabPage1.Controls.Add(Me.TBPMO_RIGHT_GROUPDataGridView) Me.TabPage1.Name = "TabPage1" @@ -364,9 +520,9 @@ Partial Class frmRight_Management ' 'GridViewlUsers2Menue ' - Me.GridViewlUsers2Menue.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridViewlUsers2Menue.Appearance.EvenRow.BackColor"), System.Drawing.Color) + Me.GridViewlUsers2Menue.Appearance.EvenRow.BackColor = System.Drawing.Color.LightBlue Me.GridViewlUsers2Menue.Appearance.EvenRow.Options.UseBackColor = True - Me.GridViewlUsers2Menue.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridViewlUsers2Menue.Appearance.FocusedRow.BackColor"), System.Drawing.Color) + Me.GridViewlUsers2Menue.Appearance.FocusedRow.BackColor = System.Drawing.Color.Fuchsia Me.GridViewlUsers2Menue.Appearance.FocusedRow.Options.UseBackColor = True Me.GridViewlUsers2Menue.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colSelect, Me.colSurname, Me.GridColumn2, Me.GridColumn3, Me.colID}) Me.GridViewlUsers2Menue.GridControl = Me.GridControlUsers2Menue @@ -426,7 +582,7 @@ Partial Class frmRight_Management ' 'GridView1 ' - Me.GridView1.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridView1.Appearance.EvenRow.BackColor"), System.Drawing.Color) + Me.GridView1.Appearance.EvenRow.BackColor = System.Drawing.Color.Aqua Me.GridView1.Appearance.EvenRow.Options.UseBackColor = True Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colGUID, Me.colFORM_TITLE, Me.colUSERNAME, Me.colNAME, Me.colPRENAME, Me.colEDIT_REC, Me.colADD_REC, Me.colDELETE_REC, Me.colADD_DOC, Me.colREAD_ONLY_DOC, Me.colDELETE_DOC, Me.GridColumn1, Me.colADDED_WHEN, Me.colCHANGED_WHEN}) Me.GridView1.GridControl = Me.GridControl1 @@ -694,103 +850,136 @@ Partial Class frmRight_Management ' Me.USER_RIGHTSTableAdapter.ClearBeforeFill = True ' - 'TBDD_GROUPSBindingSource - ' - Me.TBDD_GROUPSBindingSource.DataMember = "TBDD_GROUPS" - Me.TBDD_GROUPSBindingSource.DataSource = Me.DD_ECMAdmin - ' 'TBDD_GROUPSTableAdapter ' Me.TBDD_GROUPSTableAdapter.ClearBeforeFill = True ' - 'DataGridViewTextBoxColumn1 + 'GUIDLabel ' - Me.DataGridViewTextBoxColumn1.DataPropertyName = "GUID" - resources.ApplyResources(Me.DataGridViewTextBoxColumn1, "DataGridViewTextBoxColumn1") - Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1" - Me.DataGridViewTextBoxColumn1.ReadOnly = True + resources.ApplyResources(GUIDLabel, "GUIDLabel") + GUIDLabel.Name = "GUIDLabel" ' - 'DataGridViewTextBoxColumn2 + 'GUIDTextBox ' - Me.DataGridViewTextBoxColumn2.DataPropertyName = "ENTITY_ID" - Me.DataGridViewTextBoxColumn2.DataSource = Me.TBWH_ENTITIESBindingSource - Me.DataGridViewTextBoxColumn2.DisplayMember = "CAPTION" - resources.ApplyResources(Me.DataGridViewTextBoxColumn2, "DataGridViewTextBoxColumn2") - Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" - Me.DataGridViewTextBoxColumn2.Resizable = System.Windows.Forms.DataGridViewTriState.[True] - Me.DataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic - Me.DataGridViewTextBoxColumn2.ValueMember = "GUID" + Me.GUIDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_RIGHT_GROUPBindingSource, "GUID", True)) + resources.ApplyResources(Me.GUIDTextBox, "GUIDTextBox") + Me.GUIDTextBox.Name = "GUIDTextBox" ' - 'DataGridViewTextBoxColumn3 + 'ENTITY_IDLabel ' - Me.DataGridViewTextBoxColumn3.DataPropertyName = "GROUP_ID" - Me.DataGridViewTextBoxColumn3.DataSource = Me.TBDD_GROUPSBindingSource - Me.DataGridViewTextBoxColumn3.DisplayMember = "NAME" - resources.ApplyResources(Me.DataGridViewTextBoxColumn3, "DataGridViewTextBoxColumn3") - Me.DataGridViewTextBoxColumn3.Name = "DataGridViewTextBoxColumn3" - Me.DataGridViewTextBoxColumn3.Resizable = System.Windows.Forms.DataGridViewTriState.[True] - Me.DataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic - Me.DataGridViewTextBoxColumn3.ValueMember = "GUID" + resources.ApplyResources(ENTITY_IDLabel, "ENTITY_IDLabel") + ENTITY_IDLabel.Name = "ENTITY_IDLabel" ' - 'DataGridViewCheckBoxColumn1 + 'ENTITY_IDComboBox ' - Me.DataGridViewCheckBoxColumn1.DataPropertyName = "EDIT_REC" - resources.ApplyResources(Me.DataGridViewCheckBoxColumn1, "DataGridViewCheckBoxColumn1") - Me.DataGridViewCheckBoxColumn1.Name = "DataGridViewCheckBoxColumn1" + Me.ENTITY_IDComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_RIGHT_GROUPBindingSource, "ENTITY_ID", True)) + Me.ENTITY_IDComboBox.DataSource = Me.TBWH_ENTITIESBindingSource + Me.ENTITY_IDComboBox.DisplayMember = "FORM_TITLE" + Me.ENTITY_IDComboBox.FormattingEnabled = True + resources.ApplyResources(Me.ENTITY_IDComboBox, "ENTITY_IDComboBox") + Me.ENTITY_IDComboBox.Name = "ENTITY_IDComboBox" + Me.ENTITY_IDComboBox.ValueMember = "GUID" ' - 'DataGridViewCheckBoxColumn2 + 'GROUP_IDLabel ' - Me.DataGridViewCheckBoxColumn2.DataPropertyName = "ADD_REC" - resources.ApplyResources(Me.DataGridViewCheckBoxColumn2, "DataGridViewCheckBoxColumn2") - Me.DataGridViewCheckBoxColumn2.Name = "DataGridViewCheckBoxColumn2" + resources.ApplyResources(GROUP_IDLabel, "GROUP_IDLabel") + GROUP_IDLabel.Name = "GROUP_IDLabel" ' - 'DataGridViewCheckBoxColumn3 + 'GROUP_IDComboBox ' - Me.DataGridViewCheckBoxColumn3.DataPropertyName = "DELETE_REC" - resources.ApplyResources(Me.DataGridViewCheckBoxColumn3, "DataGridViewCheckBoxColumn3") - Me.DataGridViewCheckBoxColumn3.Name = "DataGridViewCheckBoxColumn3" + Me.GROUP_IDComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_RIGHT_GROUPBindingSource, "GROUP_ID", True)) + Me.GROUP_IDComboBox.DataSource = Me.TBDD_GROUPSBindingSource + Me.GROUP_IDComboBox.DisplayMember = "NAME" + Me.GROUP_IDComboBox.FormattingEnabled = True + resources.ApplyResources(Me.GROUP_IDComboBox, "GROUP_IDComboBox") + Me.GROUP_IDComboBox.Name = "GROUP_IDComboBox" + Me.GROUP_IDComboBox.ValueMember = "GUID" ' - 'DataGridViewCheckBoxColumn4 + 'EDIT_RECCheckBox ' - Me.DataGridViewCheckBoxColumn4.DataPropertyName = "ADD_DOC" - resources.ApplyResources(Me.DataGridViewCheckBoxColumn4, "DataGridViewCheckBoxColumn4") - Me.DataGridViewCheckBoxColumn4.Name = "DataGridViewCheckBoxColumn4" + Me.EDIT_RECCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPMO_RIGHT_GROUPBindingSource, "EDIT_REC", True)) + resources.ApplyResources(Me.EDIT_RECCheckBox, "EDIT_RECCheckBox") + Me.EDIT_RECCheckBox.Name = "EDIT_RECCheckBox" + Me.EDIT_RECCheckBox.UseVisualStyleBackColor = True ' - 'DataGridViewCheckBoxColumn5 + 'ADD_RECCheckBox ' - Me.DataGridViewCheckBoxColumn5.DataPropertyName = "VIEW_DOC" - resources.ApplyResources(Me.DataGridViewCheckBoxColumn5, "DataGridViewCheckBoxColumn5") - Me.DataGridViewCheckBoxColumn5.Name = "DataGridViewCheckBoxColumn5" + Me.ADD_RECCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPMO_RIGHT_GROUPBindingSource, "ADD_REC", True)) + resources.ApplyResources(Me.ADD_RECCheckBox, "ADD_RECCheckBox") + Me.ADD_RECCheckBox.Name = "ADD_RECCheckBox" + Me.ADD_RECCheckBox.UseVisualStyleBackColor = True ' - 'DataGridViewCheckBoxColumn6 + 'DELETE_RECCheckBox ' - Me.DataGridViewCheckBoxColumn6.DataPropertyName = "DELETE_DOC" - resources.ApplyResources(Me.DataGridViewCheckBoxColumn6, "DataGridViewCheckBoxColumn6") - Me.DataGridViewCheckBoxColumn6.Name = "DataGridViewCheckBoxColumn6" + Me.DELETE_RECCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPMO_RIGHT_GROUPBindingSource, "DELETE_REC", True)) + resources.ApplyResources(Me.DELETE_RECCheckBox, "DELETE_RECCheckBox") + Me.DELETE_RECCheckBox.Name = "DELETE_RECCheckBox" + Me.DELETE_RECCheckBox.UseVisualStyleBackColor = True ' - 'DataGridViewTextBoxColumn4 + 'ADD_DOCCheckBox ' - Me.DataGridViewTextBoxColumn4.DataPropertyName = "ADDED_WHO" - resources.ApplyResources(Me.DataGridViewTextBoxColumn4, "DataGridViewTextBoxColumn4") - Me.DataGridViewTextBoxColumn4.Name = "DataGridViewTextBoxColumn4" + Me.ADD_DOCCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPMO_RIGHT_GROUPBindingSource, "ADD_DOC", True)) + resources.ApplyResources(Me.ADD_DOCCheckBox, "ADD_DOCCheckBox") + Me.ADD_DOCCheckBox.Name = "ADD_DOCCheckBox" + Me.ADD_DOCCheckBox.UseVisualStyleBackColor = True ' - 'DataGridViewTextBoxColumn5 + 'VIEW_DOCCheckBox ' - Me.DataGridViewTextBoxColumn5.DataPropertyName = "ADDED_WHEN" - resources.ApplyResources(Me.DataGridViewTextBoxColumn5, "DataGridViewTextBoxColumn5") - Me.DataGridViewTextBoxColumn5.Name = "DataGridViewTextBoxColumn5" + Me.VIEW_DOCCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPMO_RIGHT_GROUPBindingSource, "VIEW_DOC", True)) + resources.ApplyResources(Me.VIEW_DOCCheckBox, "VIEW_DOCCheckBox") + Me.VIEW_DOCCheckBox.Name = "VIEW_DOCCheckBox" + Me.VIEW_DOCCheckBox.UseVisualStyleBackColor = True ' - 'DataGridViewTextBoxColumn6 + 'DELETE_DOCCheckBox ' - Me.DataGridViewTextBoxColumn6.DataPropertyName = "CHANGED_WHO" - resources.ApplyResources(Me.DataGridViewTextBoxColumn6, "DataGridViewTextBoxColumn6") - Me.DataGridViewTextBoxColumn6.Name = "DataGridViewTextBoxColumn6" + Me.DELETE_DOCCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPMO_RIGHT_GROUPBindingSource, "DELETE_DOC", True)) + resources.ApplyResources(Me.DELETE_DOCCheckBox, "DELETE_DOCCheckBox") + Me.DELETE_DOCCheckBox.Name = "DELETE_DOCCheckBox" + Me.DELETE_DOCCheckBox.UseVisualStyleBackColor = True ' - 'DataGridViewTextBoxColumn7 + 'ADDED_WHOLabel ' - Me.DataGridViewTextBoxColumn7.DataPropertyName = "CHANGED_WHEN" - resources.ApplyResources(Me.DataGridViewTextBoxColumn7, "DataGridViewTextBoxColumn7") - Me.DataGridViewTextBoxColumn7.Name = "DataGridViewTextBoxColumn7" + resources.ApplyResources(ADDED_WHOLabel, "ADDED_WHOLabel") + ADDED_WHOLabel.Name = "ADDED_WHOLabel" + ' + 'ADDED_WHOTextBox + ' + Me.ADDED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_RIGHT_GROUPBindingSource, "ADDED_WHO", True)) + resources.ApplyResources(Me.ADDED_WHOTextBox, "ADDED_WHOTextBox") + Me.ADDED_WHOTextBox.Name = "ADDED_WHOTextBox" + ' + 'ADDED_WHENLabel + ' + resources.ApplyResources(ADDED_WHENLabel, "ADDED_WHENLabel") + ADDED_WHENLabel.Name = "ADDED_WHENLabel" + ' + 'ADDED_WHENTextBox + ' + Me.ADDED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_RIGHT_GROUPBindingSource, "ADDED_WHEN", True)) + resources.ApplyResources(Me.ADDED_WHENTextBox, "ADDED_WHENTextBox") + Me.ADDED_WHENTextBox.Name = "ADDED_WHENTextBox" + ' + 'CHANGED_WHOLabel + ' + resources.ApplyResources(CHANGED_WHOLabel, "CHANGED_WHOLabel") + CHANGED_WHOLabel.Name = "CHANGED_WHOLabel" + ' + 'CHANGED_WHOTextBox + ' + Me.CHANGED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_RIGHT_GROUPBindingSource, "CHANGED_WHO", True)) + resources.ApplyResources(Me.CHANGED_WHOTextBox, "CHANGED_WHOTextBox") + Me.CHANGED_WHOTextBox.Name = "CHANGED_WHOTextBox" + ' + 'CHANGED_WHENLabel + ' + resources.ApplyResources(CHANGED_WHENLabel, "CHANGED_WHENLabel") + CHANGED_WHENLabel.Name = "CHANGED_WHENLabel" + ' + 'CHANGED_WHENTextBox + ' + Me.CHANGED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_RIGHT_GROUPBindingSource, "CHANGED_WHEN", True)) + resources.ApplyResources(Me.CHANGED_WHENTextBox, "CHANGED_WHENTextBox") + Me.CHANGED_WHENTextBox.Name = "CHANGED_WHENTextBox" ' 'frmRight_Management ' @@ -807,6 +996,7 @@ Partial Class frmRight_Management CType(Me.TBPMO_RIGHT_GROUPDataGridView, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBWH_ENTITIESBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TBDD_GROUPSBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBDD_USER_GROUPSBindingSource, System.ComponentModel.ISupportInitialize).EndInit() Me.StatusStrip1.ResumeLayout(False) Me.StatusStrip1.PerformLayout() @@ -826,7 +1016,6 @@ Partial Class frmRight_Management CType(Me.USER_RIGHTSBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBDD_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBWH_USER_GROUPSBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TBDD_GROUPSBindingSource, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -925,4 +1114,17 @@ Partial Class frmRight_Management Friend WithEvents DataGridViewTextBoxColumn5 As DataGridViewTextBoxColumn Friend WithEvents DataGridViewTextBoxColumn6 As DataGridViewTextBoxColumn Friend WithEvents DataGridViewTextBoxColumn7 As DataGridViewTextBoxColumn + Friend WithEvents CHANGED_WHENTextBox As TextBox + Friend WithEvents CHANGED_WHOTextBox As TextBox + Friend WithEvents ADDED_WHENTextBox As TextBox + Friend WithEvents ADDED_WHOTextBox As TextBox + Friend WithEvents DELETE_DOCCheckBox As CheckBox + Friend WithEvents VIEW_DOCCheckBox As CheckBox + Friend WithEvents ADD_DOCCheckBox As CheckBox + Friend WithEvents DELETE_RECCheckBox As CheckBox + Friend WithEvents ADD_RECCheckBox As CheckBox + Friend WithEvents EDIT_RECCheckBox As CheckBox + Friend WithEvents GROUP_IDComboBox As ComboBox + Friend WithEvents ENTITY_IDComboBox As ComboBox + Friend WithEvents GUIDTextBox As TextBox End Class diff --git a/app/DD-Record-Organizer/frmRight_Management.resx b/app/DD-Record-Organizer/frmRight_Management.resx index 45e7b5a..b32eb28 100644 --- a/app/DD-Record-Organizer/frmRight_Management.resx +++ b/app/DD-Record-Organizer/frmRight_Management.resx @@ -124,7 +124,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + wQAADsEBuJFr7QAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA @@ -161,7 +161,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + wQAADsEBuJFr7QAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG @@ -182,7 +182,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + wQAADsEBuJFr7QAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA @@ -202,7 +202,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + wQAADsEBuJFr7QAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC @@ -226,6 +226,9 @@ False + + Segoe UI, 9pt + 50, 23 @@ -241,7 +244,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + wQAADsEBuJFr7QAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -259,7 +262,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + wQAADsEBuJFr7QAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG @@ -319,7 +322,7 @@ TabPage1 - 0 + 20 @@ -401,10 +404,10 @@ Changed when - 6, 31 + 6, 140 - 1152, 361 + 1152, 252 4 @@ -419,7 +422,7 @@ TabPage1 - 1 + 21 160, 17 @@ -463,6 +466,507 @@ True + + False + + + True + + + 745, 89 + + + 98, 13 + + + 22 + + + CHANGED WHEN: + + + CHANGED_WHENLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 0 + + + 849, 86 + + + 100, 22 + + + 23 + + + CHANGED_WHENTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 1 + + + False + + + True + + + 750, 61 + + + 93, 13 + + + 21 + + + CHANGED WHO: + + + CHANGED_WHOLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 2 + + + 849, 58 + + + 100, 22 + + + 22 + + + CHANGED_WHOTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 3 + + + False + + + True + + + 548, 90 + + + 83, 13 + + + 20 + + + ADDED WHEN: + + + ADDED_WHENLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 4 + + + 637, 87 + + + 100, 22 + + + 21 + + + ADDED_WHENTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 5 + + + False + + + True + + + 553, 62 + + + 78, 13 + + + 19 + + + ADDED WHO: + + + ADDED_WHOLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 6 + + + 637, 59 + + + 100, 22 + + + 20 + + + ADDED_WHOTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 7 + + + 379, 107 + + + 104, 24 + + + 19 + + + Delete Doc + + + DELETE_DOCCheckBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 8 + + + 379, 83 + + + 104, 24 + + + 17 + + + View Doc + + + VIEW_DOCCheckBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 9 + + + 379, 59 + + + 104, 24 + + + 15 + + + Add Doc + + + ADD_DOCCheckBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 10 + + + 260, 107 + + + 104, 24 + + + 13 + + + Delete Record + + + DELETE_RECCheckBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 11 + + + 260, 83 + + + 104, 24 + + + 11 + + + Add Record + + + ADD_RECCheckBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 12 + + + 260, 57 + + + 104, 24 + + + 9 + + + Edit Record + + + EDIT_RECCheckBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 13 + + + False + + + True + + + 9, 89 + + + 49, 13 + + + 6 + + + Gruppe: + + + GROUP_IDLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 14 + + + 61, 86 + + + 171, 21 + + + 7 + + + GROUP_IDComboBox + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 15 + + + False + + + True + + + 8, 62 + + + 50, 13 + + + 5 + + + EntityID: + + + ENTITY_IDLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 16 + + + 61, 59 + + + 171, 21 + + + 6 + + + ENTITY_IDComboBox + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 17 + + + False + + + True + + + 8, 34 + + + 21, 13 + + + 4 + + + ID: + + + GUIDLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 18 + + + 61, 31 + + + 100, 22 + + + 5 + + + GUIDTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 19 + 4, 22 @@ -626,7 +1130,7 @@ Des Weiteren werden die Rechte für die Zugriffsrechte auf die Dateien angewende iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - xAAADsQBlSsOGwAAALhJREFUOE+tk8ENhCAQRSnFWqiEOiiAO42sJXjmRCnsXriy83VIZCQE153kJcKf + wgAADsIBFShKgAAAALhJREFUOE+tk8ENhCAQRSnFWqiEOiiAO42sJXjmRCnsXriy83VIZCQE153kJcKf /yM6KFk5Z0NsRBFgz3DbtUhciBhCKNbaorVuwB409KCXbUexOTnnLkaJ9x4hqQmhRYTQM/TgkFjNBq8m m9bXWt7ps4NnqfNxDAK23pnBKAQeeBHQCJJRCLxNQG0ccQ75f0CPmSM8/ojPfiPPQpyZwkozSCha7KM8 M43dUUZxyG+X6Vwk3rjOSn0Bs2pSjcG3D98AAAAASUVORK5CYII= @@ -674,12 +1178,6 @@ Des Weiteren werden die Rechte für die Zugriffsrechte auf die Dateien angewende 11, 120 - - LightBlue - - - Fuchsia - Selection @@ -776,9 +1274,6 @@ Des Weiteren werden die Rechte für die Zugriffsrechte auf die Dateien angewende 273, 120 - - Aqua - GUID @@ -983,7 +1478,7 @@ Des Weiteren werden die Rechte für die Zugriffsrechte auf die Dateien angewende iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + wQAADsEBuJFr7QAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA @@ -1003,7 +1498,7 @@ Des Weiteren werden die Rechte für die Zugriffsrechte auf die Dateien angewende iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + wQAADsEBuJFr7QAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC @@ -1027,6 +1522,9 @@ Des Weiteren werden die Rechte für die Zugriffsrechte auf die Dateien angewende False + + Segoe UI, 9pt + 50, 23 @@ -1042,7 +1540,7 @@ Des Weiteren werden die Rechte für die Zugriffsrechte auf die Dateien angewende iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + wQAADsEBuJFr7QAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -1060,7 +1558,7 @@ Des Weiteren werden die Rechte für die Zugriffsrechte auf die Dateien angewende iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + wQAADsEBuJFr7QAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG @@ -1341,6 +1839,18 @@ Des Weiteren werden die Rechte für die Zugriffsrechte auf die Dateien angewende System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + DataGridViewTextBoxColumn1 + + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + DataGridViewTextBoxColumn2 + + + System.Windows.Forms.DataGridViewComboBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + TBWH_ENTITIESBindingSource @@ -1353,6 +1863,78 @@ Des Weiteren werden die Rechte für die Zugriffsrechte auf die Dateien angewende DD_Record_Organizer.DD_ECMAdmin, DD_ECMAdmin.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + DataGridViewTextBoxColumn3 + + + System.Windows.Forms.DataGridViewComboBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TBDD_GROUPSBindingSource + + + System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + DataGridViewCheckBoxColumn1 + + + System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + DataGridViewCheckBoxColumn2 + + + System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + DataGridViewCheckBoxColumn3 + + + System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + DataGridViewCheckBoxColumn4 + + + System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + DataGridViewCheckBoxColumn5 + + + System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + DataGridViewCheckBoxColumn6 + + + System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + DataGridViewTextBoxColumn4 + + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + DataGridViewTextBoxColumn5 + + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + DataGridViewTextBoxColumn6 + + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + DataGridViewTextBoxColumn7 + + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + TBDD_USER_GROUPSBindingSource @@ -1629,96 +2211,12 @@ Des Weiteren werden die Rechte für die Zugriffsrechte auf die Dateien angewende DD_Record_Organizer.DD_ECMAdminTableAdapters.USER_RIGHTSTableAdapter, DD_ECMAdmin.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - TBDD_GROUPSBindingSource - - - System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TBDD_GROUPSTableAdapter DD_Record_Organizer.DD_ECMAdminTableAdapters.TBDD_GROUPSTableAdapter, DD_ECMAdmin.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - DataGridViewTextBoxColumn1 - - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - DataGridViewTextBoxColumn2 - - - System.Windows.Forms.DataGridViewComboBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - DataGridViewTextBoxColumn3 - - - System.Windows.Forms.DataGridViewComboBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - DataGridViewCheckBoxColumn1 - - - System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - DataGridViewCheckBoxColumn2 - - - System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - DataGridViewCheckBoxColumn3 - - - System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - DataGridViewCheckBoxColumn4 - - - System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - DataGridViewCheckBoxColumn5 - - - System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - DataGridViewCheckBoxColumn6 - - - System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - DataGridViewTextBoxColumn4 - - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - DataGridViewTextBoxColumn5 - - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - DataGridViewTextBoxColumn6 - - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - DataGridViewTextBoxColumn7 - - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - frmRight_Management diff --git a/app/DD-Record-Organizer/frmRight_Management.vb b/app/DD-Record-Organizer/frmRight_Management.vb index 0d47310..efd0df3 100644 --- a/app/DD-Record-Organizer/frmRight_Management.vb +++ b/app/DD-Record-Organizer/frmRight_Management.vb @@ -66,7 +66,7 @@ End If Catch ex As Exception - End Try + End Try End Sub Sub Save_Datagrid(ByVal _Datagrid As DataGridView, ByVal _settings_String As String) Try @@ -140,8 +140,8 @@ Private Sub TBPMO_RIGHT_GROUPBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBPMO_RIGHT_GROUPBindingSource.AddingNew Me.DD_DMSDataSet.TBPMO_RIGHT_GROUP.ADDED_WHOColumn.DefaultValue = USER_USERNAME + Me.DD_DMSDataSet.TBPMO_RIGHT_GROUP.ENTITY_IDColumn.DefaultValue = MYDB_ECM.GetScalarValue("SELECT MIN(GUID) FROM TBPMO_FORM") End Sub - Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click Save_Group_Rights_Data() End Sub @@ -165,7 +165,7 @@ Private Sub TabControl1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl1.SelectedIndexChanged Select Case TabControl1.SelectedIndex Case 1 - Dim sql = String.Format("select T1.FORM_ID, [dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), T1.GUID), 1) AS 'FORM_TITLE' FROM TBPMO_FORM_VIEW T1 " & _ + Dim sql = String.Format("select T1.FORM_ID, [dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), T1.GUID), 1) AS 'FORM_TITLE' FROM TBPMO_FORM_VIEW T1 " & "WHERE T1.SCREEN_ID = 1 ORDER BY T1.FORM_TITLE", USER_LANGUAGE) Dim DT As DataTable = MYDB_ECM.GetDatatable(sql) If Not IsNothing(DT) Then @@ -300,4 +300,5 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.GUID NOT IN (SELECT USER_ID FROM TBPMO_RIGH ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in grvwGridPos_CellValueChanged: ", ex.Message) End Try End Sub + End Class \ No newline at end of file