diff --git a/app/DD-Record-Organizer/frmRight_Management.Designer.vb b/app/DD-Record-Organizer/frmRight_Management.Designer.vb index f5352cb..ea1dc39 100644 --- a/app/DD-Record-Organizer/frmRight_Management.Designer.vb +++ b/app/DD-Record-Organizer/frmRight_Management.Designer.vb @@ -31,6 +31,7 @@ Partial Class frmRight_Management Dim CHANGED_WHOLabel As System.Windows.Forms.Label Dim ADDED_WHENLabel As System.Windows.Forms.Label Dim CHANGED_WHENLabel As System.Windows.Forms.Label + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.BindingNavigator1 = New System.Windows.Forms.BindingNavigator(Me.components) Me.VWPMO_RIGHT_GROUPBindingSource2 = New System.Windows.Forms.BindingSource(Me.components) Me.DD_ECMAdmin = New DD_Record_Organizer.DD_ECMAdmin() @@ -56,11 +57,12 @@ Partial Class frmRight_Management Me.InfoLabel = New System.Windows.Forms.ToolStripStatusLabel() Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() + Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.cmbSicht = New System.Windows.Forms.ComboBox() Me.Button1 = New System.Windows.Forms.Button() - Me.Label4 = New System.Windows.Forms.Label() Me.Label3 = New System.Windows.Forms.Label() Me.cmbGroupNew = New System.Windows.Forms.ComboBox() - Me.cmbSicht = New System.Windows.Forms.ComboBox() + Me.Label4 = New System.Windows.Forms.Label() Me.CHANGED_WHENTextBox = New System.Windows.Forms.TextBox() Me.ADDED_WHENTextBox = New System.Windows.Forms.TextBox() Me.CHANGED_WHOTextBox = New System.Windows.Forms.TextBox() @@ -143,7 +145,7 @@ Partial Class frmRight_Management Me.USER_RIGHTSTableAdapter = New DD_Record_Organizer.DD_ECMAdminTableAdapters.USER_RIGHTSTableAdapter() Me.TBDD_GROUPSTableAdapter = New DD_Record_Organizer.DD_ECMAdminTableAdapters.TBDD_GROUPSTableAdapter() Me.VWPMO_RIGHT_GROUPTableAdapter = New DD_Record_Organizer.DD_ECMAdminTableAdapters.VWPMO_RIGHT_GROUPTableAdapter() - Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton() IDLabel = New System.Windows.Forms.Label() ENTITY_NAMELabel = New System.Windows.Forms.Label() GROUP_NAMELabel = New System.Windows.Forms.Label() @@ -163,6 +165,7 @@ Partial Class frmRight_Management Me.StatusStrip1.SuspendLayout() Me.TabControl1.SuspendLayout() Me.TabPage1.SuspendLayout() + Me.GroupBox1.SuspendLayout() CType(Me.VWPMO_RIGHT_GROUPDataGridView, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabPage2.SuspendLayout() CType(Me.GridControlUsers2Menue, System.ComponentModel.ISupportInitialize).BeginInit() @@ -175,7 +178,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() - Me.GroupBox1.SuspendLayout() Me.SuspendLayout() ' 'IDLabel @@ -220,7 +222,7 @@ Partial Class frmRight_Management Me.BindingNavigator1.CountItem = Me.BindingNavigatorCountItem Me.BindingNavigator1.CountItemFormat = "von {0} Gruppenrechten" Me.BindingNavigator1.DeleteItem = Me.BindingNavigatorDeleteItem - Me.BindingNavigator1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem, Me.BindingNavigatorMovePreviousItem, Me.BindingNavigatorSeparator, Me.BindingNavigatorPositionItem, Me.BindingNavigatorCountItem, Me.BindingNavigatorSeparator1, Me.BindingNavigatorMoveNextItem, Me.BindingNavigatorMoveLastItem, Me.BindingNavigatorSeparator2, Me.BindingNavigatorDeleteItem, Me.ToolStripButton2}) + Me.BindingNavigator1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem, Me.BindingNavigatorMovePreviousItem, Me.BindingNavigatorSeparator, Me.BindingNavigatorPositionItem, Me.BindingNavigatorCountItem, Me.BindingNavigatorSeparator1, Me.BindingNavigatorMoveNextItem, Me.BindingNavigatorMoveLastItem, Me.BindingNavigatorSeparator2, Me.BindingNavigatorDeleteItem, Me.ToolStripButton2, Me.ToolStripButton1}) resources.ApplyResources(Me.BindingNavigator1, "BindingNavigator1") Me.BindingNavigator1.MoveFirstItem = Me.BindingNavigatorMoveFirstItem Me.BindingNavigator1.MoveLastItem = Me.BindingNavigatorMoveLastItem @@ -385,6 +387,26 @@ Partial Class frmRight_Management Me.TabPage1.Name = "TabPage1" Me.TabPage1.UseVisualStyleBackColor = True ' + 'GroupBox1 + ' + Me.GroupBox1.Controls.Add(Me.cmbSicht) + Me.GroupBox1.Controls.Add(Me.Button1) + Me.GroupBox1.Controls.Add(Me.Label3) + Me.GroupBox1.Controls.Add(Me.cmbGroupNew) + Me.GroupBox1.Controls.Add(Me.Label4) + resources.ApplyResources(Me.GroupBox1, "GroupBox1") + Me.GroupBox1.Name = "GroupBox1" + Me.GroupBox1.TabStop = False + ' + 'cmbSicht + ' + Me.cmbSicht.DataSource = Me.TBWH_ENTITIESBindingSource + Me.cmbSicht.DisplayMember = "FORM_TITLE" + Me.cmbSicht.FormattingEnabled = True + resources.ApplyResources(Me.cmbSicht, "cmbSicht") + Me.cmbSicht.Name = "cmbSicht" + Me.cmbSicht.ValueMember = "GUID" + ' 'Button1 ' Me.Button1.Image = Global.DD_Record_Organizer.My.Resources.Resources.action_add_16xLG @@ -392,11 +414,6 @@ Partial Class frmRight_Management Me.Button1.Name = "Button1" Me.Button1.UseVisualStyleBackColor = True ' - 'Label4 - ' - resources.ApplyResources(Me.Label4, "Label4") - Me.Label4.Name = "Label4" - ' 'Label3 ' resources.ApplyResources(Me.Label3, "Label3") @@ -411,14 +428,10 @@ Partial Class frmRight_Management Me.cmbGroupNew.Name = "cmbGroupNew" Me.cmbGroupNew.ValueMember = "GUID" ' - 'cmbSicht + 'Label4 ' - Me.cmbSicht.DataSource = Me.TBWH_ENTITIESBindingSource - Me.cmbSicht.DisplayMember = "FORM_TITLE" - Me.cmbSicht.FormattingEnabled = True - resources.ApplyResources(Me.cmbSicht, "cmbSicht") - Me.cmbSicht.Name = "cmbSicht" - Me.cmbSicht.ValueMember = "GUID" + resources.ApplyResources(Me.Label4, "Label4") + Me.Label4.Name = "Label4" ' 'CHANGED_WHENTextBox ' @@ -518,12 +531,15 @@ Partial Class frmRight_Management Me.VWPMO_RIGHT_GROUPDataGridView.AllowUserToOrderColumns = True Me.VWPMO_RIGHT_GROUPDataGridView.AllowUserToResizeColumns = False Me.VWPMO_RIGHT_GROUPDataGridView.AllowUserToResizeRows = False + DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.VWPMO_RIGHT_GROUPDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 resources.ApplyResources(Me.VWPMO_RIGHT_GROUPDataGridView, "VWPMO_RIGHT_GROUPDataGridView") Me.VWPMO_RIGHT_GROUPDataGridView.AutoGenerateColumns = False Me.VWPMO_RIGHT_GROUPDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.VWPMO_RIGHT_GROUPDataGridView.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.IDDataGridViewTextBoxColumn, Me.ENTITYNAMEDataGridViewTextBoxColumn, Me.GROUPNAMEDataGridViewTextBoxColumn, Me.EDITRECDataGridViewCheckBoxColumn, Me.ADDRECDataGridViewCheckBoxColumn, Me.DELETERECDataGridViewCheckBoxColumn, Me.ADDDOCDataGridViewCheckBoxColumn, Me.VIEWDOCDataGridViewCheckBoxColumn, Me.DELETEDOCDataGridViewCheckBoxColumn, Me.ADDEDWHODataGridViewTextBoxColumn, Me.ADDEDWHENDataGridViewTextBoxColumn, Me.CHANGEDWHODataGridViewTextBoxColumn, Me.CHANGEDWHENDataGridViewTextBoxColumn}) Me.VWPMO_RIGHT_GROUPDataGridView.DataSource = Me.VWPMO_RIGHT_GROUPBindingSource2 Me.VWPMO_RIGHT_GROUPDataGridView.Name = "VWPMO_RIGHT_GROUPDataGridView" + Me.VWPMO_RIGHT_GROUPDataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect ' 'IDDataGridViewTextBoxColumn ' @@ -534,14 +550,12 @@ Partial Class frmRight_Management 'ENTITYNAMEDataGridViewTextBoxColumn ' Me.ENTITYNAMEDataGridViewTextBoxColumn.DataPropertyName = "ENTITY_NAME" - Me.ENTITYNAMEDataGridViewTextBoxColumn.FillWeight = 150.0! resources.ApplyResources(Me.ENTITYNAMEDataGridViewTextBoxColumn, "ENTITYNAMEDataGridViewTextBoxColumn") Me.ENTITYNAMEDataGridViewTextBoxColumn.Name = "ENTITYNAMEDataGridViewTextBoxColumn" ' 'GROUPNAMEDataGridViewTextBoxColumn ' Me.GROUPNAMEDataGridViewTextBoxColumn.DataPropertyName = "GROUP_NAME" - Me.GROUPNAMEDataGridViewTextBoxColumn.FillWeight = 150.0! resources.ApplyResources(Me.GROUPNAMEDataGridViewTextBoxColumn, "GROUPNAMEDataGridViewTextBoxColumn") Me.GROUPNAMEDataGridViewTextBoxColumn.Name = "GROUPNAMEDataGridViewTextBoxColumn" ' @@ -1004,16 +1018,12 @@ Partial Class frmRight_Management ' Me.VWPMO_RIGHT_GROUPTableAdapter.ClearBeforeFill = True ' - 'GroupBox1 + 'ToolStripButton1 ' - Me.GroupBox1.Controls.Add(Me.cmbSicht) - Me.GroupBox1.Controls.Add(Me.Button1) - Me.GroupBox1.Controls.Add(Me.Label3) - Me.GroupBox1.Controls.Add(Me.cmbGroupNew) - Me.GroupBox1.Controls.Add(Me.Label4) - resources.ApplyResources(Me.GroupBox1, "GroupBox1") - Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.TabStop = False + Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.ToolStripButton1.Image = Global.DD_Record_Organizer.My.Resources.Resources.save_16xLG + resources.ApplyResources(Me.ToolStripButton1, "ToolStripButton1") + Me.ToolStripButton1.Name = "ToolStripButton1" ' 'frmRight_Management ' @@ -1037,6 +1047,8 @@ Partial Class frmRight_Management Me.TabControl1.ResumeLayout(False) Me.TabPage1.ResumeLayout(False) Me.TabPage1.PerformLayout() + Me.GroupBox1.ResumeLayout(False) + Me.GroupBox1.PerformLayout() CType(Me.VWPMO_RIGHT_GROUPDataGridView, System.ComponentModel.ISupportInitialize).EndInit() Me.TabPage2.ResumeLayout(False) Me.TabPage2.PerformLayout() @@ -1051,8 +1063,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() - Me.GroupBox1.ResumeLayout(False) - Me.GroupBox1.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -1138,19 +1148,6 @@ Partial Class frmRight_Management Friend WithEvents VWPMO_RIGHT_GROUPTableAdapter As DD_ECMAdminTableAdapters.VWPMO_RIGHT_GROUPTableAdapter Friend WithEvents VWPMO_RIGHT_GROUPDataGridView As DataGridView Friend WithEvents VWPMO_RIGHT_GROUPBindingSource2 As BindingSource - Friend WithEvents IDDataGridViewTextBoxColumn As DataGridViewTextBoxColumn - Friend WithEvents ENTITYNAMEDataGridViewTextBoxColumn As DataGridViewTextBoxColumn - Friend WithEvents GROUPNAMEDataGridViewTextBoxColumn As DataGridViewTextBoxColumn - Friend WithEvents EDITRECDataGridViewCheckBoxColumn As DataGridViewCheckBoxColumn - Friend WithEvents ADDRECDataGridViewCheckBoxColumn As DataGridViewCheckBoxColumn - Friend WithEvents DELETERECDataGridViewCheckBoxColumn As DataGridViewCheckBoxColumn - Friend WithEvents ADDDOCDataGridViewCheckBoxColumn As DataGridViewCheckBoxColumn - Friend WithEvents VIEWDOCDataGridViewCheckBoxColumn As DataGridViewCheckBoxColumn - Friend WithEvents DELETEDOCDataGridViewCheckBoxColumn As DataGridViewCheckBoxColumn - Friend WithEvents ADDEDWHODataGridViewTextBoxColumn As DataGridViewTextBoxColumn - Friend WithEvents ADDEDWHENDataGridViewTextBoxColumn As DataGridViewTextBoxColumn - Friend WithEvents CHANGEDWHODataGridViewTextBoxColumn As DataGridViewTextBoxColumn - Friend WithEvents CHANGEDWHENDataGridViewTextBoxColumn As DataGridViewTextBoxColumn Friend WithEvents DELETE_DOCCheckBox As CheckBox Friend WithEvents VIEW_DOCCheckBox As CheckBox Friend WithEvents ADD_DOCCheckBox As CheckBox @@ -1171,4 +1168,18 @@ Partial Class frmRight_Management Friend WithEvents cmbGroupNew As ComboBox Friend WithEvents cmbSicht As ComboBox Friend WithEvents GroupBox1 As GroupBox + Friend WithEvents IDDataGridViewTextBoxColumn As DataGridViewTextBoxColumn + Friend WithEvents ENTITYNAMEDataGridViewTextBoxColumn As DataGridViewTextBoxColumn + Friend WithEvents GROUPNAMEDataGridViewTextBoxColumn As DataGridViewTextBoxColumn + Friend WithEvents EDITRECDataGridViewCheckBoxColumn As DataGridViewCheckBoxColumn + Friend WithEvents ADDRECDataGridViewCheckBoxColumn As DataGridViewCheckBoxColumn + Friend WithEvents DELETERECDataGridViewCheckBoxColumn As DataGridViewCheckBoxColumn + Friend WithEvents ADDDOCDataGridViewCheckBoxColumn As DataGridViewCheckBoxColumn + Friend WithEvents VIEWDOCDataGridViewCheckBoxColumn As DataGridViewCheckBoxColumn + Friend WithEvents DELETEDOCDataGridViewCheckBoxColumn As DataGridViewCheckBoxColumn + Friend WithEvents ADDEDWHODataGridViewTextBoxColumn As DataGridViewTextBoxColumn + Friend WithEvents ADDEDWHENDataGridViewTextBoxColumn As DataGridViewTextBoxColumn + Friend WithEvents CHANGEDWHODataGridViewTextBoxColumn As DataGridViewTextBoxColumn + Friend WithEvents CHANGEDWHENDataGridViewTextBoxColumn As DataGridViewTextBoxColumn + Friend WithEvents ToolStripButton1 As ToolStripButton End Class diff --git a/app/DD-Record-Organizer/frmRight_Management.resx b/app/DD-Record-Organizer/frmRight_Management.resx index 2a73733..a49c5e6 100644 --- a/app/DD-Record-Organizer/frmRight_Management.resx +++ b/app/DD-Record-Organizer/frmRight_Management.resx @@ -480,6 +480,15 @@ Refresh + + Magenta + + + 23, 22 + + + ToolStripButton1 + 3, 3 @@ -504,18 +513,12 @@ 22 - - 415, 54 - 822, 17 17, 17 - - 17, 17 - 551, 54 @@ -528,6 +531,21 @@ 501, 91 + + 0, 17 + + + False + + + 0, 17 + + + 36, 17 + + + None + 0, 424 @@ -552,21 +570,6 @@ 1 - - 0, 17 - - - False - - - 0, 17 - - - 36, 17 - - - None - True @@ -1030,9 +1033,15 @@ Sicht Name + + 180 + Gruppen Name + + 180 + Edit Record @@ -1054,12 +1063,18 @@ Erstellt wer + + 80 + Erstellt wann Geändert wer + + 130 + Geändert wann @@ -1111,174 +1126,9 @@ 0 - - 617, 91 - True - - btndeleteUserRight - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 0 - - - Label2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 1 - - - cmbEntity - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 2 - - - Label1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 3 - - - btnAddUser2ConstructorREL - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 4 - - - GridControlUsers2Menue - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - TabPage2 - - - 5 - - - lblUsers - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 6 - - - GridControl1 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - TabPage2 - - - 7 - - - BindingNavigator2 - - - System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 8 - - - Tahoma, 8.25pt - - - 4, 22 - - - 3, 3, 3, 3 - - - 1161, 398 - - - 1 - - - Benutzer Rechte - - - TabPage2 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl1 - - - 1 - - - Fill - - - 0, 0 - - - 1169, 424 - - - 6 - - - TabControl1 - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m @@ -1893,6 +1743,60 @@ Des Weiteren werden die Rechte für die Zugriffsrechte auf die Dateien angewende 8 + + Tahoma, 8.25pt + + + 4, 22 + + + 3, 3, 3, 3 + + + 1161, 398 + + + 1 + + + Benutzer Rechte + + + TabPage2 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl1 + + + 1 + + + Fill + + + 0, 0 + + + 1169, 424 + + + 6 + + + TabControl1 + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + 770, 91 @@ -2454,6 +2358,12 @@ Des Weiteren werden die Rechte für die Zugriffsrechte auf die Dateien angewende DD_Record_Organizer.DD_ECMAdminTableAdapters.VWPMO_RIGHT_GROUPTableAdapter, DD_ECMAdmin.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + ToolStripButton1 + + + System.Windows.Forms.ToolStripButton, 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 04f19a3..712c230 100644 --- a/app/DD-Record-Organizer/frmRight_Management.vb +++ b/app/DD-Record-Organizer/frmRight_Management.vb @@ -1,10 +1,12 @@ -Public Class frmRight_Management +Imports DD_Record_Organizer.ControlLoader + +Public Class frmRight_Management Private Shared _Instance As frmRight_Management = Nothing Private insert As Boolean = False Private formloaded As Boolean = False Private updateIP As Boolean = False - Private DGSelection As Boolean = False Private ID_CURR As Integer = 0 + Public Shared Function Instance() As frmRight_Management If _Instance Is Nothing OrElse _Instance.IsDisposed = True Then _Instance = New frmRight_Management @@ -126,7 +128,7 @@ Sub Refresh_Free_Users() Dim Sql = $"SELECT T.* FROM TBDD_USER T INNER JOIN TBDD_USER_MODULES T1 ON T.GUID = T1.USER_ID INNER JOIN TBDD_MODULES T2 ON T1.MODULE_ID = T2.GUID WHERE T2.SHORT_NAME = 'ADDI' AND T.GUID NOT IN (SELECT USER_ID FROM TBPMO_RIGHT_USER WHERE ENTITY_ID = {cmbEntity.SelectedValue}) ORDER BY USERNAME" - Dim DT_USER = MYDB_ECM.GetDatatable(sql) + Dim DT_USER = MYDB_ECM.GetDatatable(Sql) Try DD_ECMAdmin.TBAD_Users.Clear() @@ -247,66 +249,27 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.GUID NOT IN (SELECT USER_ID FROM TBPMO_RIGH End Try End Sub - Private Sub EDIT_RECCheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles EDIT_RECCheckBox.CheckedChanged - If updateIP = False Then - Update_RightGroup_VALUE("EDIT_REC", EDIT_RECCheckBox.Checked, IDTextBox.Text) - End If - End Sub - - Private Sub Update_RightGroup_VALUE(pItem As String, obit As Boolean, pID As String) - If formloaded = False Or pID = "" Or DGSelection = True Then - Exit Sub - End If + Private Sub Update_RightGroup() updateIP = True - ID_CURR = pID - Dim oupdate = $"UPDATE TBPMO_RIGHT_GROUP SET {pItem} = '{obit}', CHANGED_WHO = '{Environment.UserName}' WHERE GUID = {pID} - and {pItem} <> '{obit}'" + ID_CURR = IDTextBox.Text + Dim oID = IDTextBox.Text + Dim oupdate = $"UPDATE TBPMO_RIGHT_GROUP SET EDIT_REC = '{EDIT_RECCheckBox.Checked}', +ADD_REC = '{ADD_RECCheckBox.Checked}', +DELETE_REC = '{DELETE_DOCCheckBox.Checked}', +ADD_DOC = '{ADD_DOCCheckBox.Checked}', +VIEW_DOC = '{VIEW_DOCCheckBox.Checked}', +DELETE_DOC = '{DELETE_DOCCheckBox.Checked}', +CHANGED_WHO = '{Environment.UserName}' WHERE GUID = {oID}" If MYDB_ECM.ExecuteNonQuery(oupdate) Then - InfoLabel.Text = $"{pItem} updated successfully - {Now.ToLongTimeString}" + InfoLabel.Text = $"Group_Definition updated successfully - {Now.ToLongTimeString}" Refresh_Rights_Groups() - VWPMO_RIGHT_GROUPBindingSource2.Position = VWPMO_RIGHT_GROUPBindingSource2.Find("ID", ID_CURR) + VWPMO_RIGHT_GROUPBindingSource2.Position = VWPMO_RIGHT_GROUPBindingSource2.Find("ID", oID) updateIP = False End If End Sub - Private Sub ADD_RECCheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles ADD_RECCheckBox.CheckedChanged - If updateIP = False Then - Update_RightGroup_VALUE("ADD_REC", ADD_RECCheckBox.Checked, IDTextBox.Text) - End If - End Sub - - Private Sub DELETE_RECCheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles DELETE_RECCheckBox.CheckedChanged - If updateIP = False Then - Update_RightGroup_VALUE("DELETE_REC", DELETE_RECCheckBox.Checked, IDTextBox.Text) - End If - - End Sub - - Private Sub ADD_DOCCheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles ADD_DOCCheckBox.CheckedChanged - If updateIP = False Then - Update_RightGroup_VALUE("ADD_DOC", ADD_DOCCheckBox.Checked, IDTextBox.Text) - End If - - - End Sub - - Private Sub VIEW_DOCCheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles VIEW_DOCCheckBox.CheckedChanged - If updateIP = False Then - Update_RightGroup_VALUE("VIEW_DOC", VIEW_DOCCheckBox.Checked, IDTextBox.Text) - End If - - - End Sub - - Private Sub DELETE_DOCCheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles DELETE_DOCCheckBox.CheckedChanged - If updateIP = False Then - Update_RightGroup_VALUE("DELETE_DOC", DELETE_DOCCheckBox.Checked, IDTextBox.Text) - End If - - - End Sub Private Sub frmRight_Management_Shown(sender As Object, e As EventArgs) Handles Me.Shown formloaded = True @@ -337,4 +300,24 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.GUID NOT IN (SELECT USER_ID FROM TBPMO_RIGH End If End If End Sub + + Private Sub VWPMO_RIGHT_GROUPBindingSource2_PositionChanged(sender As Object, e As EventArgs) Handles VWPMO_RIGHT_GROUPBindingSource2.PositionChanged + If formloaded = False Then + Exit Sub + End If + Try + Dim oID = VWPMO_RIGHT_GROUPDataGridView.SelectedRows(0).Cells(0).Value + ID_CURR = oID + InfoLabel.Text = oID + Catch ex As Exception + InfoLabel.Text = ex.Message + End Try + + End Sub + + Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click + If IDTextBox.Text <> "" Then + Update_RightGroup() + End If + End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmStructureNodeConfig.vb b/app/DD-Record-Organizer/frmStructureNodeConfig.vb index d4cd942..7e46a09 100644 --- a/app/DD-Record-Organizer/frmStructureNodeConfig.vb +++ b/app/DD-Record-Organizer/frmStructureNodeConfig.vb @@ -335,6 +335,10 @@ Private Sub btnSelectBackground_Click(sender As Object, e As EventArgs) Handles btnSelectBackground.Click Try + If Me.GUIDTextBox.Text = "" Then + MsgBox("Please choose a node by clicking in the treeview!", MsgBoxStyle.Exclamation) + Exit Sub + End If OpenFileDialog1.Filter = "PNG Bilder|*.png" If OpenFileDialog1.ShowDialog() = System.Windows.Forms.DialogResult.OK Then Dim path As String = OpenFileDialog1.FileName @@ -354,6 +358,7 @@ conn.Open() cmd.ExecuteNonQuery() conn.Close() + LoadData() End If End If End If @@ -436,6 +441,7 @@ End If End Sub + Private Sub BindingNavigatorAddNewItem_Click(sender As Object, e As EventArgs) Handles BindingNavigatorAddNewItem.Click 'Try ' TBPMO_STRUCTURE_NODES_CONFIGURATIONBindingSource.AddNew()