diff --git a/app/DD-Record-Organiser/ClassDOC_SEARCH.vb b/app/DD-Record-Organiser/ClassDOC_SEARCH.vb index 6def4f9..75013ec 100644 --- a/app/DD-Record-Organiser/ClassDOC_SEARCH.vb +++ b/app/DD-Record-Organiser/ClassDOC_SEARCH.vb @@ -266,12 +266,12 @@ Public Class ClassDOC_SEARCH Return False End Try End Function - Public Shared Function SET_WD_RIGHTS(ByVal RESULT_DOCID, ByVal RESULT_DOC_PATH) + Public Shared Function SET_WD_RIGHTS(ByVal RESULT_DOCID, ByVal RESULT_DOC_PATH, ByVal ENTITY_ID) Try DD_Rights.ClassLogger.Init(Application.UserAppDataPath() & "\Log", Environment.UserName) If DD_Rights.ClassDatabase.Init(MyConnectionString) = True Then If DD_Rights.ClassRights.Init(ENTITY_ID, LogErrorsOnly) = True Then - If DD_Rights.ClassRights.Collect_Users(RECORD_ID) = True Then + If DD_Rights.ClassRights.Collect_Users(RECORD_ID, ENTITY_ID) = True Then If DD_Rights.ClassRights.File_DeleteAndSetRight(RESULT_DOCID, RESULT_DOC_PATH, True) Then If DD_Rights.ClassRights.MSG_RESULT <> "" Then MsgBox("Unexpected Errors in setting rights: " & vbNewLine & DD_Rights.ClassRights.MSG_RESULT, MsgBoxStyle.Exclamation) diff --git a/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb b/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb index 5a143c0..dc312c2 100644 --- a/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb +++ b/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb @@ -115,6 +115,14 @@ Partial Class frmConstructorDesigner Me.listBoxControls = New System.Windows.Forms.ListBox() Me.Label3 = New System.Windows.Forms.Label() Me.XtraTabPage4 = New DevExpress.XtraTab.XtraTabPage() + Me.GroupBoxSupervisorControls = New System.Windows.Forms.GroupBox() + Me.btndeleteSupervisorControl = New System.Windows.Forms.Button() + Me.btnAddSupervisorControl = New System.Windows.Forms.Button() + Me.Label15 = New System.Windows.Forms.Label() + Me.CheckedListBoxSupervisorControls = New System.Windows.Forms.CheckedListBox() + Me.Label14 = New System.Windows.Forms.Label() + Me.cmbSupervisorControls = New System.Windows.Forms.ComboBox() + Me.Label13 = New System.Windows.Forms.Label() Me.GroupBoxDocSearch = New System.Windows.Forms.GroupBox() Me.GridControl2 = New DevExpress.XtraGrid.GridControl() Me.TBWH_Users2BindingSource = New System.Windows.Forms.BindingSource(Me.components) @@ -136,8 +144,8 @@ Partial Class frmConstructorDesigner Me.btnAddUser2Supervisor = New System.Windows.Forms.Button() Me.Label9 = New System.Windows.Forms.Label() Me.Label7 = New System.Windows.Forms.Label() - Me.lblSaveDocSearch = New System.Windows.Forms.Label() Me.chkWDSearch_Active = New System.Windows.Forms.CheckBox() + Me.lblSaveDocSearch = New System.Windows.Forms.Label() Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage() Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() @@ -250,6 +258,7 @@ Partial Class frmConstructorDesigner Me.XtraTabPage3.SuspendLayout() Me.XtraTabPage5.SuspendLayout() Me.XtraTabPage4.SuspendLayout() + Me.GroupBoxSupervisorControls.SuspendLayout() Me.GroupBoxDocSearch.SuspendLayout() CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBWH_Users2BindingSource, System.ComponentModel.ISupportInitialize).BeginInit() @@ -847,11 +856,66 @@ Partial Class frmConstructorDesigner 'XtraTabPage4 ' resources.ApplyResources(Me.XtraTabPage4, "XtraTabPage4") - Me.XtraTabPage4.Controls.Add(Me.chkWDSearch_Active) + Me.XtraTabPage4.Controls.Add(Me.GroupBoxSupervisorControls) Me.XtraTabPage4.Controls.Add(Me.GroupBoxDocSearch) + Me.XtraTabPage4.Controls.Add(Me.chkWDSearch_Active) Me.XtraTabPage4.Controls.Add(Me.lblSaveDocSearch) Me.XtraTabPage4.Name = "XtraTabPage4" ' + 'GroupBoxSupervisorControls + ' + resources.ApplyResources(Me.GroupBoxSupervisorControls, "GroupBoxSupervisorControls") + Me.GroupBoxSupervisorControls.Controls.Add(Me.btndeleteSupervisorControl) + Me.GroupBoxSupervisorControls.Controls.Add(Me.btnAddSupervisorControl) + Me.GroupBoxSupervisorControls.Controls.Add(Me.Label15) + Me.GroupBoxSupervisorControls.Controls.Add(Me.CheckedListBoxSupervisorControls) + Me.GroupBoxSupervisorControls.Controls.Add(Me.Label14) + Me.GroupBoxSupervisorControls.Controls.Add(Me.cmbSupervisorControls) + Me.GroupBoxSupervisorControls.Controls.Add(Me.Label13) + Me.GroupBoxSupervisorControls.Name = "GroupBoxSupervisorControls" + Me.GroupBoxSupervisorControls.TabStop = False + ' + 'btndeleteSupervisorControl + ' + resources.ApplyResources(Me.btndeleteSupervisorControl, "btndeleteSupervisorControl") + Me.btndeleteSupervisorControl.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete + Me.btndeleteSupervisorControl.Name = "btndeleteSupervisorControl" + Me.btndeleteSupervisorControl.UseVisualStyleBackColor = True + ' + 'btnAddSupervisorControl + ' + resources.ApplyResources(Me.btnAddSupervisorControl, "btnAddSupervisorControl") + Me.btnAddSupervisorControl.Name = "btnAddSupervisorControl" + Me.btnAddSupervisorControl.UseVisualStyleBackColor = True + ' + 'Label15 + ' + resources.ApplyResources(Me.Label15, "Label15") + Me.Label15.Name = "Label15" + ' + 'CheckedListBoxSupervisorControls + ' + resources.ApplyResources(Me.CheckedListBoxSupervisorControls, "CheckedListBoxSupervisorControls") + Me.CheckedListBoxSupervisorControls.BackColor = System.Drawing.SystemColors.GradientActiveCaption + Me.CheckedListBoxSupervisorControls.FormattingEnabled = True + Me.CheckedListBoxSupervisorControls.Name = "CheckedListBoxSupervisorControls" + ' + 'Label14 + ' + resources.ApplyResources(Me.Label14, "Label14") + Me.Label14.Name = "Label14" + ' + 'cmbSupervisorControls + ' + resources.ApplyResources(Me.cmbSupervisorControls, "cmbSupervisorControls") + Me.cmbSupervisorControls.FormattingEnabled = True + Me.cmbSupervisorControls.Name = "cmbSupervisorControls" + ' + 'Label13 + ' + resources.ApplyResources(Me.Label13, "Label13") + Me.Label13.Name = "Label13" + ' 'GroupBoxDocSearch ' resources.ApplyResources(Me.GroupBoxDocSearch, "GroupBoxDocSearch") @@ -987,9 +1051,9 @@ Partial Class frmConstructorDesigner ' 'cmbRight ' + resources.ApplyResources(Me.cmbRight, "cmbRight") Me.cmbRight.FormattingEnabled = True Me.cmbRight.Items.AddRange(New Object() {resources.GetString("cmbRight.Items"), resources.GetString("cmbRight.Items1"), resources.GetString("cmbRight.Items2")}) - resources.ApplyResources(Me.cmbRight, "cmbRight") Me.cmbRight.Name = "cmbRight" ' 'btnDeleteUserSupervisor @@ -1014,18 +1078,18 @@ Partial Class frmConstructorDesigner resources.ApplyResources(Me.Label7, "Label7") Me.Label7.Name = "Label7" ' - 'lblSaveDocSearch - ' - resources.ApplyResources(Me.lblSaveDocSearch, "lblSaveDocSearch") - Me.lblSaveDocSearch.BackColor = System.Drawing.Color.Yellow - Me.lblSaveDocSearch.Name = "lblSaveDocSearch" - ' 'chkWDSearch_Active ' resources.ApplyResources(Me.chkWDSearch_Active, "chkWDSearch_Active") Me.chkWDSearch_Active.Name = "chkWDSearch_Active" Me.chkWDSearch_Active.UseVisualStyleBackColor = True ' + 'lblSaveDocSearch + ' + resources.ApplyResources(Me.lblSaveDocSearch, "lblSaveDocSearch") + Me.lblSaveDocSearch.BackColor = System.Drawing.Color.Yellow + Me.lblSaveDocSearch.Name = "lblSaveDocSearch" + ' 'XtraTabPage2 ' Me.XtraTabPage2.Controls.Add(Me.TabControl1) @@ -1327,10 +1391,10 @@ Partial Class frmConstructorDesigner ' 'ListBox1 ' - resources.ApplyResources(Me.ListBox1, "ListBox1") Me.ListBox1.DataSource = Me.TBPMO_FORM_CONSTRUCTORBindingSource Me.ListBox1.DisplayMember = "FORM_TITLE" Me.ListBox1.FormattingEnabled = True + resources.ApplyResources(Me.ListBox1, "ListBox1") Me.ListBox1.Name = "ListBox1" Me.ListBox1.ValueMember = "GUID" ' @@ -1478,8 +1542,8 @@ Partial Class frmConstructorDesigner ' 'GridControlUsers2Menue ' - resources.ApplyResources(Me.GridControlUsers2Menue, "GridControlUsers2Menue") Me.GridControlUsers2Menue.DataSource = Me.TBAD_UsersBindingSource + resources.ApplyResources(Me.GridControlUsers2Menue, "GridControlUsers2Menue") Me.GridControlUsers2Menue.MainView = Me.GridViewlUsers2Menue Me.GridControlUsers2Menue.Name = "GridControlUsers2Menue" Me.GridControlUsers2Menue.ShowOnlyPredefinedDetails = True @@ -1636,6 +1700,8 @@ Partial Class frmConstructorDesigner Me.XtraTabPage5.PerformLayout() Me.XtraTabPage4.ResumeLayout(False) Me.XtraTabPage4.PerformLayout() + Me.GroupBoxSupervisorControls.ResumeLayout(False) + Me.GroupBoxSupervisorControls.PerformLayout() Me.GroupBoxDocSearch.ResumeLayout(False) Me.GroupBoxDocSearch.PerformLayout() CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).EndInit() @@ -1833,4 +1899,12 @@ Partial Class frmConstructorDesigner Friend WithEvents GridColumn15 As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents GridColumn16 As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents GridColumn17 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents GroupBoxSupervisorControls As System.Windows.Forms.GroupBox + Friend WithEvents cmbSupervisorControls As System.Windows.Forms.ComboBox + Friend WithEvents Label13 As System.Windows.Forms.Label + Friend WithEvents btnAddSupervisorControl As System.Windows.Forms.Button + Friend WithEvents Label15 As System.Windows.Forms.Label + Friend WithEvents CheckedListBoxSupervisorControls As System.Windows.Forms.CheckedListBox + Friend WithEvents Label14 As System.Windows.Forms.Label + Friend WithEvents btndeleteSupervisorControl As System.Windows.Forms.Button End Class diff --git a/app/DD-Record-Organiser/frmConstructorDesigner.resx b/app/DD-Record-Organiser/frmConstructorDesigner.resx index d4da063..cba1393 100644 --- a/app/DD-Record-Organiser/frmConstructorDesigner.resx +++ b/app/DD-Record-Organiser/frmConstructorDesigner.resx @@ -252,7 +252,7 @@ Segoe UI, 8.25pt, style=Italic - 248, 154 + 247, 203 61, 13 @@ -285,7 +285,7 @@ Segoe UI, 8.25pt, style=Italic - 413, 154 + 412, 203 70, 13 @@ -318,7 +318,7 @@ Segoe UI, 8.25pt, style=Italic - 248, 195 + 247, 244 73, 13 @@ -351,7 +351,7 @@ Segoe UI, 8.25pt, style=Italic - 413, 195 + 412, 244 82, 13 @@ -1129,7 +1129,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABS - CQAAAk1TRnQBSQFMAgEBAgEAAfQBCwH0AQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAgEAATwBDAE8AQwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -1178,7 +1178,7 @@ 1 - 292, 408 + 292, 394 1 @@ -1286,7 +1286,7 @@ Segoe UI, 8.25pt, style=Italic - 251, 170 + 250, 219 149, 22 @@ -1310,7 +1310,7 @@ Segoe UI, 8.25pt, style=Italic - 417, 170 + 416, 219 144, 22 @@ -1334,7 +1334,7 @@ Segoe UI, 8.25pt, style=Italic - 251, 211 + 250, 260 149, 22 @@ -1358,7 +1358,7 @@ Segoe UI, 8.25pt, style=Italic - 416, 211 + 415, 260 144, 22 @@ -1427,10 +1427,10 @@ 23 - Bottom, Left, Right + Top, Bottom, Left, Right - 15, 294 + 15, 305 Fill @@ -1742,7 +1742,7 @@ 21 - 976, 333 + 976, 319 Allgemein @@ -1760,7 +1760,7 @@ 1 - 982, 361 + 982, 347 35 @@ -2211,7 +2211,7 @@ 13 - 976, 333 + 976, 319 Quick View Konfiguration @@ -2231,31 +2231,265 @@ True - + + Top, Bottom, Left + + + Tahoma, 8.25pt + + + MiddleRight + + + 293, 81 + + + 112, 23 + + + 98 + + + Remove Control + + + MiddleLeft + + + btndeleteSupervisorControl + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBoxSupervisorControls + + + 0 + + + Tahoma, 8.25pt + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + xAAADsQBlSsOGwAAALhJREFUOE+tk8ENhCAQRSnFWqiEOiiAO42sJXjmRCnsXriy83VIZCQE153kJcKf + /yM6KFk5Z0NsRBFgz3DbtUhciBhCKNbaorVuwB409KCXbUexOTnnLkaJ9x4hqQmhRYTQM/TgkFjNBq8m + m9bXWt7ps4NnqfNxDAK23pnBKAQeeBHQCJJRCLxNQG0ccQ75f0CPmSM8/ojPfiPPQpyZwkozSCha7KM8 + M43dUUZxyG+X6Vwk3rjOSn0Bs2pSjcG3D98AAAAASUVORK5CYII= + + + + MiddleRight + + + NoControl + + + 293, 52 + + + 112, 23 + + + 97 + + + Add Control + + + MiddleLeft + + + btnAddSupervisorControl + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBoxSupervisorControls + + + 1 + + True - - 5, 14 + + Tahoma, 8.25pt - - 110, 17 + + NoControl - - 79 + + 408, 38 - - Dateisuche aktiv? + + 99, 13 - - chkWDSearch_Active + + 96 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Gewählte Controls: - + + Label15 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBoxSupervisorControls + + + 2 + + + Top, Bottom, Left + + + Tahoma, 8.25pt + + + 411, 54 + + + 253, 52 + + + 95 + + + CheckedListBoxSupervisorControls + + + System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBoxSupervisorControls + + + 3 + + + True + + + Tahoma, 8.25pt + + + NoControl + + + 6, 38 + + + 99, 13 + + + 94 + + + Supervisor wählen: + + + Label14 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBoxSupervisorControls + + + 4 + + + Tahoma, 8.25pt + + + 9, 54 + + + 275, 21 + + + 93 + + + cmbSupervisorControls + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBoxSupervisorControls + + + 5 + + + True + + + Tahoma, 8.25pt, style=Italic + + + NoControl + + + 6, 17 + + + 844, 13 + + + 92 + + + Wählen Sie hier Controls aus der Entität welche Userangaben enthalten. Pro Datensatz werden die/der enthaltene User dann mit Supervisorrechten auf die Dateien versehen. + + + Label13 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBoxSupervisorControls + + + 6 + + + False + + + Tahoma, 8.25pt, style=Bold + + + 9, 210 + + + 964, 106 + + + 82 + + + Supervisor-Controls + + + GroupBoxSupervisorControls + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + XtraTabPage4 - + 0 @@ -2268,7 +2502,7 @@ 223, 212 - 540, 42 + 540, 33 Cyan @@ -2307,7 +2541,7 @@ 190 - 408, 245 + 408, 123 99 @@ -2331,7 +2565,7 @@ 984, 173 - 9, 42 + 9, 33 Cyan @@ -2370,7 +2604,7 @@ 167 - 377, 245 + 377, 123 98 @@ -2390,6 +2624,9 @@ True + + Tahoma, 8.25pt + NoControl @@ -2417,6 +2654,9 @@ 2 + + Tahoma, 8.25pt + Admin @@ -2447,6 +2687,9 @@ 3 + + Tahoma, 8.25pt + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m @@ -2497,6 +2740,9 @@ 4 + + Tahoma, 8.25pt + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -2542,11 +2788,14 @@ True + + Tahoma, 8.25pt + NoControl - 538, 26 + 537, 17 127, 13 @@ -2572,17 +2821,20 @@ True + + Tahoma, 8.25pt + - 6, 19 + 6, 17 - 151, 13 + 99, 13 91 - Supervisor für Entität wählen: + Supervisor wählen: Label7 @@ -2599,17 +2851,20 @@ False + + Tahoma, 8.25pt, style=Bold + - 5, 37 + 9, 28 - 968, 293 + 964, 162 81 - Eigenschaften Dokumentensuche + Supervisor-Definition-(User erhalten Vollzugriff auf Entitätzugehörige Dateien) GroupBoxDocSearch @@ -2623,6 +2878,33 @@ 1 + + True + + + 18, 8 + + + 110, 17 + + + 79 + + + Dateisuche aktiv? + + + chkWDSearch_Active + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage4 + + + 2 + True @@ -2633,7 +2915,7 @@ NoControl - 123, 15 + 828, 12 129, 13 @@ -2657,13 +2939,13 @@ XtraTabPage4 - 2 + 3 - 976, 333 + 976, 319 - Dateisuche Konfiguration + Konfiguration ECM-Zugriff XtraTabPage4 @@ -2714,7 +2996,7 @@ 102 - 272, 274 + 272, 121 89 @@ -2744,7 +3026,7 @@ NoControl - 283, 143 + 283, -10 132, 15 @@ -2780,7 +3062,7 @@ NoControl - 536, 143 + 536, -10 55, 15 @@ -2807,7 +3089,7 @@ Bottom, Left - 539, 161 + 539, 8 449, 140 @@ -2846,7 +3128,7 @@ False - 287, 161 + 287, 8 246, 140 @@ -2879,7 +3161,7 @@ NoControl - 733, 127 + 733, -26 255, 31 @@ -3164,7 +3446,7 @@ 3, 3, 3, 3 - 993, 307 + 968, 307 0 @@ -3191,7 +3473,7 @@ 3, 3, 3, 3 - 993, 307 + 968, 307 1 @@ -3218,7 +3500,7 @@ 0, 0 - 976, 333 + 976, 319 0 @@ -3236,7 +3518,7 @@ 0 - 976, 333 + 976, 319 Einschränkungen User @@ -3429,7 +3711,7 @@ Mandanten hinzu 5 - 976, 333 + 976, 319 Zuordnung Entität-Client @@ -3471,7 +3753,7 @@ Mandanten hinzu False - 292, 386 + 292, 372 982, 22 @@ -3539,7 +3821,7 @@ Mandanten hinzu 2 - 1274, 408 + 1274, 394 Entitäten-Übersicht @@ -3557,7 +3839,7 @@ Mandanten hinzu 0 - 1280, 436 + 1280, 422 40 @@ -3577,9 +3859,6 @@ Mandanten hinzu 442, 134 - - Top, Bottom, Left - 15, 44 @@ -8782,9 +9061,6 @@ Mandanten hinzu 6 - - Bottom, Left - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -8932,9 +9208,6 @@ Mandanten hinzu 5 - - Bottom, Left - True @@ -8970,7 +9243,7 @@ Home Tab NoControl - 841, 211 + 841, 170 95, 48 @@ -9002,9 +9275,6 @@ Home Tab 667, 173 - - Top, Bottom, Left - 579, 69 @@ -9045,7 +9315,7 @@ Home Tab 102 - 256, 213 + 256, 224 88 @@ -9063,7 +9333,7 @@ Home Tab 2 - Top, Bottom, Left, Right + Top, Left, Right 941, 69 @@ -9105,7 +9375,7 @@ Home Tab 102 - 352, 213 + 352, 224 89 @@ -9132,7 +9402,7 @@ Home Tab 6, 13 - 1315, 733 + 1315, 730 Segoe UI, 8.25pt diff --git a/app/DD-Record-Organiser/frmConstructorDesigner.vb b/app/DD-Record-Organiser/frmConstructorDesigner.vb index 40a945f..83549d3 100644 --- a/app/DD-Record-Organiser/frmConstructorDesigner.vb +++ b/app/DD-Record-Organiser/frmConstructorDesigner.vb @@ -372,13 +372,17 @@ Public Class frmConstructorDesigner 'Dim check = ClassDatabase.Execute_Scalar("SELECT DOCUMENT_VIEW FROM TBPMO_FORM_VIEW WHERE FORM_ID = " & SELECTED_ENTITY_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID) If chkWDSearch_Active.Checked Then GroupBoxDocSearch.Enabled = True + GroupBoxSupervisorControls.Enabled = True Load_TBAD_Users() Load_Supervisor() + Load_Supervisor_Controls_Choose() + Load_Supervisor_Controls() 'If check = False Then ' ClassDatabase.Execute_Scalar("UPDATE TBPMO_FORM_VIEW SET DOCUMENT_VIEW = 1 WHERE FORM_ID = " & SELECTED_ENTITY_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID, True) 'End If Else GroupBoxDocSearch.Enabled = False + GroupBoxSupervisorControls.Enabled = False 'If check = True Then ' ClassDatabase.Execute_Scalar("UPDATE TBPMO_FORM_VIEW SET DOCUMENT_VIEW = 1 WHERE FORM_ID = " & SELECTED_ENTITY_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID, True) 'End If @@ -506,8 +510,7 @@ Public Class frmConstructorDesigner Public Sub Load_Supervisor() Try - Dim ENTITY_ID = ClassDatabase.Execute_Scalar("SELECT FORM_ID FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE GUID = " & SELECTED_CONSTRUCTOR_DETAIL_ID) - Dim sql = String.Format("SELECT T.GUID, T.USERNAME, T.EMAIL FROM TBDD_USER T WHERE T.MODULE_RECORD_ORG = 1 AND T.GUID IN (SELECT USER_ID FROM TBPMO_ENTITY_SUPERVISOR WHERE ENTITY_ID = {0}) ORDER BY T.USERNAME", ENTITY_ID) + Dim sql = String.Format("SELECT T.GUID, T.USERNAME, T.EMAIL FROM TBDD_USER T WHERE T.MODULE_RECORD_ORG = 1 AND T.GUID IN (SELECT USER_ID FROM TBPMO_ENTITY_SUPERVISOR WHERE ENTITY_ID = {0}) ORDER BY T.USERNAME", SELECTED_ENTITY_ID) Dim DT As DataTable = ClassDatabase.Return_Datatable(sql) DD_ECMAdmin.TBWH_Users2.Clear() For Each row As DataRow In DT.Rows @@ -528,6 +531,30 @@ Public Class frmConstructorDesigner MsgBox("UnexpectedError Load_Supervisor:" & vbNewLine & ex.Message) End Try End Sub + Public Sub Load_Supervisor_Controls_Choose() + Try + Dim sql = String.Format("select GUID, NAME + '/' + COL_NAME as control from tbpmo_Control where FORM_ID = {0} and CONTROL_TYPE_ID IN (2,3,12) ORDER BY NAME", SELECTED_ENTITY_ID) + Dim DT As DataTable = ClassDatabase.Return_Datatable(sql) + cmbSupervisorControls.DataSource = DT + cmbSupervisorControls.DisplayMember = DT.Columns(1).ColumnName + cmbSupervisorControls.ValueMember = DT.Columns(0).ColumnName + Catch ex As Exception + MsgBox("UnexpectedError Load_Supervisor_Controls_Choose:" & vbNewLine & ex.Message) + End Try + End Sub + Public Sub Load_Supervisor_Controls() + Try + Dim sql = String.Format("select T1.GUID, T.NAME + '/' + T.COL_NAME as [control] from tbpmo_Control T, TBPMO_SUPERVISOR_CONTROLS T1 " & _ + "where T.GUID = T1.CONTROL_ID AND T.FORM_ID = {0} ORDER BY T.NAME", SELECTED_ENTITY_ID) + Dim DT As DataTable = ClassDatabase.Return_Datatable(sql) + CheckedListBoxSupervisorControls.Items.Clear() + For Each row1 As DataRow In DT.Rows + CheckedListBoxSupervisorControls.Items.Add(New MyListBoxItem() With {.Text = row1.Item(1), .ExtraData = row1.Item(0)}) + Next + Catch ex As Exception + MsgBox("UnexpectedError Load_Supervisor_Controls:" & vbNewLine & ex.Message) + End Try + End Sub Private Sub btnAddControl_Click(sender As Object, e As EventArgs) Handles btnAddControl.Click Try Dim i = listBoxControls.SelectedValue @@ -773,8 +800,7 @@ Public Class frmConstructorDesigner Private Sub btnTestSQL_Click(sender As Object, e As EventArgs) Handles btnTestSQL.Click Try - Dim ENTITY_ID = ClassDatabase.Execute_Scalar("SELECT FORM_ID FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE GUID = " & SELECTED_CONSTRUCTOR_DETAIL_ID) - Dim EntSQL = "SELECT T.* FROM VWTEMP_PMO_FORM" & ENTITY_ID.ToString & " T" + Dim EntSQL = "SELECT T.* FROM VWTEMP_PMO_FORM" & SELECTED_ENTITY_ID.ToString & " T" Dim query As String = EntSQL & " " & SQL_COMMANDTextBox.Text For Each row As DataGridViewRow In dgvPlaceholders.Rows @@ -802,12 +828,12 @@ Public Class frmConstructorDesigner End Sub Private Sub btnsaddUser2Client_Click(sender As Object, e As EventArgs) Handles btnsaddUser2Client.Click - Dim ENTITY_ID = ClassDatabase.Execute_Scalar("SELECT FORM_ID FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE GUID = " & SELECTED_CONSTRUCTOR_DETAIL_ID) + For Each obj As Object In chklbxClient.CheckedItems Dim item As MyListBoxItem = CType(obj, MyListBoxItem) - Dim sql = "select count(*) from TBPMO_CLIENT_ENTITY Where CLIENT_ID = " & item.ExtraData & " AND ENTITY_ID = " & ENTITY_ID + Dim sql = "select count(*) from TBPMO_CLIENT_ENTITY Where CLIENT_ID = " & item.ExtraData & " AND ENTITY_ID = " & SELECTED_ENTITY_ID If ClassDatabase.Execute_Scalar(sql) = 0 Then - sql = String.Format("INSERT INTO TBPMO_CLIENT_ENTITY (CLIENT_ID, ENTITY_ID, ADDED_WHO) VALUES ({0}, {1}, '{2}')", item.ExtraData, ENTITY_ID, Environment.UserName) + sql = String.Format("INSERT INTO TBPMO_CLIENT_ENTITY (CLIENT_ID, ENTITY_ID, ADDED_WHO) VALUES ({0}, {1}, '{2}')", item.ExtraData, SELECTED_ENTITY_ID, Environment.UserName) If ClassDatabase.Execute_non_Query(sql) = False Then MsgBox("Error in Adding Entity to Client!", MsgBoxStyle.Critical) End If @@ -931,4 +957,30 @@ Public Class frmConstructorDesigner MsgBox("Error while deleting user to Constructor-Relation: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try End Sub + + Private Sub btnAddSupervisorControl_Click(sender As Object, e As EventArgs) Handles btnAddSupervisorControl.Click + If cmbSupervisorControls.SelectedIndex <> -1 Then + Dim sql = "select count(*) from TBPMO_SUPERVISOR_CONTROLS Where CONTROL_ID = " & cmbSupervisorControls.SelectedValue + If ClassDatabase.Execute_Scalar(sql) = 0 Then + sql = String.Format("INSERT INTO TBPMO_SUPERVISOR_CONTROLS (CONTROL_ID, ADDED_WHO) VALUES ({0},'{1}')", cmbSupervisorControls.SelectedValue, Environment.UserName) + If ClassDatabase.Execute_non_Query(sql) = False Then + MsgBox("Error in Adding Supervisor-Control! Check log", MsgBoxStyle.Critical) + Else + Load_Supervisor_Controls() + End If + End If + End If + End Sub + + Private Sub btndeleteSupervisorControl_Click(sender As Object, e As EventArgs) Handles btndeleteSupervisorControl.Click + For Each obj As Object In CheckedListBoxSupervisorControls.CheckedItems + Dim item As MyListBoxItem = CType(obj, MyListBoxItem) + Dim sql + sql = String.Format("DELETE FROM TBPMO_SUPERVISOR_CONTROLS WHERE GUID = {0}", item.ExtraData) + If ClassDatabase.Execute_non_Query(sql, True) = False Then + MsgBox(String.Format("Error in deleting SupervisorControl", item.Text), MsgBoxStyle.Critical) + End If + Next + Load_Supervisor_Controls() + End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organiser/frmConstructor_Main.vb b/app/DD-Record-Organiser/frmConstructor_Main.vb index d3437b2..c5dc8d5 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.vb @@ -4656,7 +4656,7 @@ Public Class frmConstructor_Main End Try End If - + CURRENT_FORM_ID = ENTITY_ID If e.Data.GetDataPresent(DataFormats.StringFormat) Then Dim Wert As String = CType(e.Data.GetData(DataFormats.StringFormat), Object) Console.WriteLine("DragDrop-Wert: " & Wert) @@ -6179,7 +6179,7 @@ Public Class frmConstructor_Main Private Sub TestToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles tsmiRights.Click Dim msg = "Die Rechte wurden erfolgreich überprüft und aktualisiert!" - If ClassDOC_SEARCH.SET_WD_RIGHTS(RESULT_DOC_ID, RESULT_DOC_PATH) = True Then + If ClassDOC_SEARCH.SET_WD_RIGHTS(RESULT_DOC_ID, RESULT_DOC_PATH, ENTITY_ID) = True Then If USER_LANGUAGE <> "de-DE" Then msg = "The rights were successfully renewed!" End If diff --git a/app/DD-Record-Organiser/frmWD_IndexFile.vb b/app/DD-Record-Organiser/frmWD_IndexFile.vb index 15f9bff..4385fa7 100644 --- a/app/DD-Record-Organiser/frmWD_IndexFile.vb +++ b/app/DD-Record-Organiser/frmWD_IndexFile.vb @@ -179,7 +179,7 @@ Public Class frmWD_IndexFile sql = String.Format("SELECT DocID FROM VWPMO_WD_DOC_SYNC WHERE UPPER(FULL_FILENAME) = UPPER('{0}') AND CONVERT(DATE,Change_DateTime) = CONVERT(DATE,GETDATE())", CURRENT_FILEIN_WD) CURRENT_DOC_ID = ClassDatabase.Execute_Scalar(sql) If Not IsNothing(CURRENT_DOC_ID) Then - ClassDOC_SEARCH.SET_WD_RIGHTS(CURRENT_DOC_ID, CURRENT_FILEIN_WD) + ClassDOC_SEARCH.SET_WD_RIGHTS(CURRENT_DOC_ID, CURRENT_FILEIN_WD, CURRENT_FORM_ID) ClassFileResult.DocID = CURRENT_DOC_ID ClassFileResult.SET_DOCID_INDICES() If ClassDOC_SEARCH.SET_RECORD_DOCID_LINK(CURRENT_DOC_ID, CURRENT_RECORD_ID) = True Then @@ -1092,7 +1092,13 @@ Public Class frmWD_IndexFile Me.Activate() Me.BringToFront() If CURRENT_CONTROL_DOCTYPE_MATCH <> "" Then + 'Me.cmbDokumentart.SelectedItem = Me.cmbDokumentart.Items.IndexOf(CURRENT_CONTROL_DOCTYPE_MATCH) cmbDokumentart.SelectedIndex = cmbDokumentart.FindStringExact(CURRENT_CONTROL_DOCTYPE_MATCH) + If cmbDokumentart.SelectedIndex = 0 And CURRENT_CONTROL_DOCTYPE_MATCH = cmbDokumentart.Text Then + CURRENT_DOKARTID = cmbDokumentart.SelectedValue + CURRENT_DOKARTSTRING = cmbDokumentart.Text + Refresh_indices() + End If End If Catch ex As Exception MsgBox("Error in Form Shown:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) diff --git a/app/RecordOrganizer_RightManager/ModuleMySettings.vb b/app/RecordOrganizer_RightManager/ModuleMySettings.vb index 1031627..b3101fb 100644 --- a/app/RecordOrganizer_RightManager/ModuleMySettings.vb +++ b/app/RecordOrganizer_RightManager/ModuleMySettings.vb @@ -8,6 +8,8 @@ Public USER_WAN As Boolean = False Public DT_WORK_USER_RIGHTS As DataTable Public DT_SUPERVISOR_ENTITY As DataTable + Public DT_WORK_USER_CONTROL_SUPERVISOR As DataTable - Public SQL_USER_RIGHTS_CHANGED = "SELECT T.GUID,T1.USERNAME + 'Reason: ' + T.COMMENT AS USER_COMMENT FROM TBPMO_USER_RIGHTS_JOBS T, TBDD_USER T1 WHERE T.USER_ID = T1.GUID AND T.WORKED = 0" + Public SQL_USER_RIGHTS_CHANGED = "SELECT T.GUID, T.USER_ID, T.COMMENT + ' - ' + T1.USERNAME AS USER_COMMENT FROM TBPMO_USER_RIGHTS_JOBS T, TBDD_USER T1 WHERE T.USER_ID = T1.GUID AND T.WORKED = 0 AND T.COMMENT IN ('USER DELETED FROM GROUP')" + Public SQL_USER_RIGHTS_SUPERVISOR_ADDED = "SELECT T.GUID, T.USER_ID, T.COMMENT + ' - ' + T1.USERNAME AS USER_COMMENT, T.ENTITY_ID FROM TBPMO_USER_RIGHTS_JOBS T, TBDD_USER T1 WHERE T.USER_ID = T1.GUID AND T.WORKED = 0 AND T.COMMENT IN('SUPERVISOR ADDED','SUPERVISOR DELETED')" End Module diff --git a/app/RecordOrganizer_RightManager/RecordOrganizer_RightManager.vbproj b/app/RecordOrganizer_RightManager/RecordOrganizer_RightManager.vbproj index 08821c0..7eab038 100644 --- a/app/RecordOrganizer_RightManager/RecordOrganizer_RightManager.vbproj +++ b/app/RecordOrganizer_RightManager/RecordOrganizer_RightManager.vbproj @@ -78,6 +78,12 @@ + + frmSupervisorEntity.vb + + + Form + frmReworkUsers.vb @@ -115,6 +121,9 @@ + + frmSupervisorEntity.vb + frmReworkUsers.vb diff --git a/app/RecordOrganizer_RightManager/frmCheckRightsEntity.vb b/app/RecordOrganizer_RightManager/frmCheckRightsEntity.vb index a662964..88793fe 100644 --- a/app/RecordOrganizer_RightManager/frmCheckRightsEntity.vb +++ b/app/RecordOrganizer_RightManager/frmCheckRightsEntity.vb @@ -6,6 +6,7 @@ Public Class frmCheckRightsEntity Private _error As Boolean = False Private countfiles As Integer = 0 Private WorkingFiles As Integer = 0 + Private CURR_DOCID As Integer Private ENTITY_ID As Integer Private Sub frmCheckRightsEntity_Load(sender As Object, e As EventArgs) Handles Me.Load Try @@ -23,12 +24,16 @@ Public Class frmCheckRightsEntity Private Sub btnCheckRights_Click(sender As Object, e As EventArgs) Handles btnCheckRights.Click If cmbentity.SelectedIndex <> -1 Then Try + CURR_DOCID = 0 ENTITY_ID = cmbentity.SelectedValue Me.ProgressBar1.Visible = True 'BackgroundWorker erstellen ... BW_RightsEntity = New BackgroundWorker BW_RightsEntity.WorkerReportsProgress = True - DT_FILES = ClassDatabase.Return_Datatable(String.Format("SELECT * FROM VWPMO_WD_DOC_SEARCH where ENTITY_ID = {0}", ENTITY_ID)) + BW_RightsEntity.WorkerSupportsCancellation = True + Dim MAX_DOC_ID = ClassDatabase.Execute_Scalar("SELECT DOC_ID FROM TBPMO_KONFIGURATION WHERE GUID = 1", False) + Dim sqlfiles = String.Format("SELECT * FROM VWPMO_WD_DOC_SEARCH where ENTITY_ID = {0} AND DocID > {1} ORDER BY DocID", ENTITY_ID, MAX_DOC_ID) + DT_FILES = ClassDatabase.Return_Datatable(sqlfiles) If DD_Rights.ClassRights.Init(ENTITY_ID, chklogging.Checked, DT_FILES.Rows.Count) = False Then MsgBox("Could not init rights management. " & vbNewLine & "Check logfile", MsgBoxStyle.Critical) Exit Sub @@ -64,8 +69,9 @@ Public Class frmCheckRightsEntity e.Cancel = True Exit For Else - If DD_Rights.ClassRights.Collect_Users(row.Item("RECORD_ID")) = True Then + If DD_Rights.ClassRights.Collect_Users(row.Item("RECORD_ID"), row.Item("ENTITY_ID")) = True Then WorkingFiles += 1 + CURR_DOCID = row.Item("DocID") If DD_Rights.ClassRights.File_DeleteAndSetRight(row.Item("DocID"), row.Item("FULL_FILENAME"), True) Then If DD_Rights.ClassRights.MSG_RESULT <> "" Then MsgBox("Unexpected Errors in setting rights: " & vbNewLine & DD_Rights.ClassRights.MSG_RESULT, MsgBoxStyle.Exclamation) @@ -87,6 +93,16 @@ Public Class frmCheckRightsEntity Private Sub btncancel_Click(sender As Object, e As EventArgs) Handles btncancel.Click ' Cancel the asynchronous operation. Me.BW_RightsEntity.CancelAsync() + + Dim result As MsgBoxResult + result = MessageBox.Show("Would You like to save the DocID for the next run?", "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + If result = MsgBoxResult.Yes Then + ClassDatabase.Execute_non_Query("UPDATE TBPMO_KONFIGURATION SET DOC_ID = " & CURR_DOCID & " WHERE GUID = 1", False) + End If + + + + End Sub Private Sub BW_RightsEntity_RunWorkerCompleted(sender As Object, e As RunWorkerCompletedEventArgs) Handles BW_RightsEntity.RunWorkerCompleted @@ -100,6 +116,7 @@ Public Class frmCheckRightsEntity MsgBox("Some errors occured while checking and setting the rights...please check the log!" & vbNewLine & ">> " & ClassRights.COUNT_FILES.ToString & " files schould be worked." & _ ">> " & ClassRights.WORKED_FILES.ToString & " were worked successfully.", MsgBoxStyle.Exclamation) End If + ClassDatabase.Execute_non_Query("UPDATE TBPMO_KONFIGURATION SET DOC_ID = 0 WHERE GUID = 1", False) Catch ex As Exception End Try diff --git a/app/RecordOrganizer_RightManager/frmReworkUsers.Designer.vb b/app/RecordOrganizer_RightManager/frmReworkUsers.Designer.vb index ab2d8d1..90b6298 100644 --- a/app/RecordOrganizer_RightManager/frmReworkUsers.Designer.vb +++ b/app/RecordOrganizer_RightManager/frmReworkUsers.Designer.vb @@ -37,9 +37,9 @@ Partial Class frmReworkUsers Me.Label1.AutoSize = True Me.Label1.Location = New System.Drawing.Point(25, 9) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(147, 16) + Me.Label1.Size = New System.Drawing.Size(141, 16) Me.Label1.TabIndex = 0 - Me.Label1.Text = "Please choose an entity:" + Me.Label1.Text = "Please choose an user:" ' 'cmbUser ' diff --git a/app/RecordOrganizer_RightManager/frmReworkUsers.vb b/app/RecordOrganizer_RightManager/frmReworkUsers.vb index 46ba5ba..5eb07a4 100644 --- a/app/RecordOrganizer_RightManager/frmReworkUsers.vb +++ b/app/RecordOrganizer_RightManager/frmReworkUsers.vb @@ -19,7 +19,7 @@ Public Class frmReworkUsers cmbUser.DataSource = Nothing cmbUser.DataSource = DT_WORK_USER_RIGHTS cmbUser.ValueMember = DT_WORK_USER_RIGHTS.Columns(0).ColumnName - cmbUser.DisplayMember = DT_WORK_USER_RIGHTS.Columns(1).ColumnName + cmbUser.DisplayMember = DT_WORK_USER_RIGHTS.Columns(2).ColumnName If DT_WORK_USER_RIGHTS.Rows.Count = 0 Then MsgBox("No more Users to rework. Form will be closed!", MsgBoxStyle.Information) Me.Close() @@ -34,6 +34,19 @@ Public Class frmReworkUsers If cmbUser.SelectedIndex <> -1 Then GUID_WORKING = 0 Try + Dim USER_ID As Integer + Dim expression As String + expression = "TYPE_NODE = 0" + Dim foundRowsLevel0() As DataRow + ' Use the Select method to find all rows matching the filter. + foundRowsLevel0 = DT_WORK_USER_RIGHTS.Select(expression) + Dim i As Integer + ' For each row + For i = 0 To foundRowsLevel0.GetUpperBound(0) + USER_ID = foundRowsLevel0(i)("USER_ID") + Next + + ENTITIES_WORKED = 0 Try ECM_USER_ID = ClassDatabase.Execute_Scalar(String.Format("SELECT USERID_FK_INT_ECM FROM TBDD_USER WHERE GUID = (SELECT USER_ID FROM TBPMO_USER_RIGHTS_JOBS WHERE GUID = {0} )", cmbUser.SelectedValue)) @@ -46,11 +59,20 @@ Public Class frmReworkUsers Dim sql = String.Format("SELECT ENTITY_ID FROM VWPMO_WD_DOC_SEARCH where DocID in (SELECT [dwObjectID] FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwUserOrGroupID = {0}) GROUP BY ENTITY_ID", ECM_USER_ID) Dim DT_ENTITY As DataTable = ClassDatabase.Return_Datatable(sql) COUNT_ENTITIES = DT_ENTITY.Rows.Count + If DT_ENTITY.Rows.Count = 0 Then + MsgBox("No files found for User. Job will be terminated!") + Finish_Job() + Exit Sub + End If For Each row As DataRow In DT_ENTITY.Rows CURR_ENTITY = row.Item("ENTITY_ID") sql = String.Format("SELECT * FROM VWPMO_WD_DOC_SEARCH where DocID in (SELECT [dwObjectID] FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwUserOrGroupID = {0}) AND ENTITY_ID = {1}", ECM_USER_ID, row.Item("ENTITY_ID")) DT_FILES = ClassDatabase.Return_Datatable(sql) - + If DT_FILES.Rows.Count = 0 Then + MsgBox("No files found for User. Job will be terminated!") + Finish_Job() + Exit Sub + End If If DD_Rights.ClassRights.Init(row.Item("ENTITY_ID"), chklogging.Checked, DT_FILES.Rows.Count) = False Then MsgBox("Could not init rights management. " & vbNewLine & "Check logfile", MsgBoxStyle.Critical) Exit Sub @@ -95,7 +117,7 @@ Public Class frmReworkUsers e.Cancel = True Exit For Else - If DD_Rights.ClassRights.Collect_Users(row.Item("RECORD_ID")) = True Then + If DD_Rights.ClassRights.Collect_Users(row.Item("RECORD_ID"), row.Item("ENTITY_ID")) = True Then WorkingFiles += 1 If DD_Rights.ClassRights.File_DeleteAndSetRight(row.Item("DocID"), row.Item("FULL_FILENAME"), True) Then If DD_Rights.ClassRights.MSG_RESULT <> "" Then @@ -135,13 +157,7 @@ Public Class frmReworkUsers lblstate.Visible = False If _error = False Then If ENTITIES_WORKED = COUNT_ENTITIES Then - Dim upd = String.Format("UPDATE TBPMO_USER_RIGHTS_JOBS SET WORKED = 1, CHANGED_WHO = 'JOB-RIGHTS FINISHER' WHERE GUID = {0}", GUID_WORKING) - If ClassDatabase.Execute_non_Query(upd) = True Then - 'Überprüfen ob es User gibt die aktualisiert werden müssen - Dim Sql = SQL_USER_RIGHTS_CHANGED - DT_WORK_USER_RIGHTS = ClassDatabase.Return_Datatable(Sql) - Refresh_Combo() - End If + Finish_Job() MsgBox("All rights of files belonging to entity/User were checked and refreshed successfully!", MsgBoxStyle.Information) End If @@ -151,5 +167,15 @@ Public Class frmReworkUsers Catch ex As Exception End Try + + End Sub + Private Sub Finish_Job() + Dim upd = String.Format("UPDATE TBPMO_USER_RIGHTS_JOBS SET WORKED = 1, CHANGED_WHO = 'JOB-RIGHTS FINISHER' WHERE GUID = {0}", GUID_WORKING) + If ClassDatabase.Execute_non_Query(upd) = True Then + 'Überprüfen ob es User gibt die aktualisiert werden müssen + Dim Sql = SQL_USER_RIGHTS_CHANGED + DT_WORK_USER_RIGHTS = ClassDatabase.Return_Datatable(Sql) + Refresh_Combo() + End If End Sub End Class \ No newline at end of file diff --git a/app/RecordOrganizer_RightManager/frmStart.Designer.vb b/app/RecordOrganizer_RightManager/frmStart.Designer.vb index be05dfb..8345c20 100644 --- a/app/RecordOrganizer_RightManager/frmStart.Designer.vb +++ b/app/RecordOrganizer_RightManager/frmStart.Designer.vb @@ -25,17 +25,18 @@ Partial Class frmStart Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmStart)) Me.Button1 = New System.Windows.Forms.Button() Me.btnWorkUserRights = New System.Windows.Forms.Button() + Me.btnWorkUserRightsSV_ADD = New System.Windows.Forms.Button() Me.Button2 = New System.Windows.Forms.Button() Me.SuspendLayout() ' 'Button1 ' - Me.Button1.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Button1.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Button1.Location = New System.Drawing.Point(12, 12) Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(250, 45) + Me.Button1.Size = New System.Drawing.Size(312, 45) Me.Button1.TabIndex = 0 - Me.Button1.Text = "Check Rights for Entity" + Me.Button1.Text = "Check Rights for documents belonging to entity" Me.Button1.UseVisualStyleBackColor = True ' 'btnWorkUserRights @@ -44,11 +45,22 @@ Partial Class frmStart Me.btnWorkUserRights.ForeColor = System.Drawing.Color.DarkRed Me.btnWorkUserRights.Location = New System.Drawing.Point(12, 63) Me.btnWorkUserRights.Name = "btnWorkUserRights" - Me.btnWorkUserRights.Size = New System.Drawing.Size(250, 45) + Me.btnWorkUserRights.Size = New System.Drawing.Size(312, 45) Me.btnWorkUserRights.TabIndex = 2 Me.btnWorkUserRights.Text = "Work User" Me.btnWorkUserRights.UseVisualStyleBackColor = True ' + 'btnWorkUserRightsSV_ADD + ' + Me.btnWorkUserRightsSV_ADD.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnWorkUserRightsSV_ADD.ForeColor = System.Drawing.Color.DarkRed + Me.btnWorkUserRightsSV_ADD.Location = New System.Drawing.Point(12, 114) + Me.btnWorkUserRightsSV_ADD.Name = "btnWorkUserRightsSV_ADD" + Me.btnWorkUserRightsSV_ADD.Size = New System.Drawing.Size(312, 45) + Me.btnWorkUserRightsSV_ADD.TabIndex = 3 + Me.btnWorkUserRightsSV_ADD.Text = "Work User" + Me.btnWorkUserRightsSV_ADD.UseVisualStyleBackColor = True + ' 'Button2 ' Me.Button2.Image = Global.RecordOrganizer_RightManager.My.Resources.Resources.folder_Closed_16xSM @@ -65,7 +77,8 @@ Partial Class frmStart ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(829, 402) + Me.ClientSize = New System.Drawing.Size(829, 173) + Me.Controls.Add(Me.btnWorkUserRightsSV_ADD) Me.Controls.Add(Me.btnWorkUserRights) Me.Controls.Add(Me.Button2) Me.Controls.Add(Me.Button1) @@ -80,5 +93,6 @@ Partial Class frmStart Friend WithEvents Button1 As System.Windows.Forms.Button Friend WithEvents Button2 As System.Windows.Forms.Button Friend WithEvents btnWorkUserRights As System.Windows.Forms.Button + Friend WithEvents btnWorkUserRightsSV_ADD As System.Windows.Forms.Button End Class diff --git a/app/RecordOrganizer_RightManager/frmStart.vb b/app/RecordOrganizer_RightManager/frmStart.vb index bcce7f0..eaf4155 100644 --- a/app/RecordOrganizer_RightManager/frmStart.vb +++ b/app/RecordOrganizer_RightManager/frmStart.vb @@ -82,6 +82,13 @@ Public Class frmStart Else btnWorkUserRights.Visible = False End If + DT_WORK_USER_CONTROL_SUPERVISOR = ClassDatabase.Return_Datatable(SQL_USER_RIGHTS_SUPERVISOR_ADDED) + If DT_WORK_USER_CONTROL_SUPERVISOR.Rows.Count > 0 Then + btnWorkUserRightsSV_ADD.Text = "New Supervisor for Record/Entity added." & vbNewLine & "Amount: " & DT_WORK_USER_CONTROL_SUPERVISOR.Rows.Count.ToString + btnWorkUserRightsSV_ADD.Visible = True + Else + btnWorkUserRightsSV_ADD.Visible = False + End If End Sub Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click ' Me.Visible = False @@ -97,4 +104,9 @@ Public Class frmStart frmReworkUsers.ShowDialog() Check_USER_REWORK() End Sub + + Private Sub btnWorkUserRightsSV_ADD_Click(sender As Object, e As EventArgs) Handles btnWorkUserRightsSV_ADD.Click + frmSupervisorEntity.ShowDialog() + Check_USER_REWORK() + End Sub End Class diff --git a/app/RecordOrganizer_RightManager/frmSupervisorEntity.Designer.vb b/app/RecordOrganizer_RightManager/frmSupervisorEntity.Designer.vb new file mode 100644 index 0000000..d04f844 --- /dev/null +++ b/app/RecordOrganizer_RightManager/frmSupervisorEntity.Designer.vb @@ -0,0 +1,144 @@ + _ +Partial Class frmSupervisorEntity + Inherits System.Windows.Forms.Form + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + Me.Label1 = New System.Windows.Forms.Label() + Me.cmbUser = New System.Windows.Forms.ComboBox() + Me.BW_RightsEntity = New System.ComponentModel.BackgroundWorker() + Me.ProgressBar1 = New System.Windows.Forms.ProgressBar() + Me.chklogging = New System.Windows.Forms.CheckBox() + Me.btncancel = New System.Windows.Forms.Button() + Me.btnCheckRights = New System.Windows.Forms.Button() + Me.lblstate = New System.Windows.Forms.Label() + Me.SuspendLayout() + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(25, 9) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(124, 16) + Me.Label1.TabIndex = 0 + Me.Label1.Text = "Please choose User:" + ' + 'cmbUser + ' + Me.cmbUser.FormattingEnabled = True + Me.cmbUser.Location = New System.Drawing.Point(28, 29) + Me.cmbUser.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmbUser.Name = "cmbUser" + Me.cmbUser.Size = New System.Drawing.Size(335, 24) + Me.cmbUser.TabIndex = 1 + ' + 'BW_RightsEntity + ' + ' + 'ProgressBar1 + ' + Me.ProgressBar1.Location = New System.Drawing.Point(28, 128) + Me.ProgressBar1.Name = "ProgressBar1" + Me.ProgressBar1.Size = New System.Drawing.Size(335, 31) + Me.ProgressBar1.TabIndex = 3 + Me.ProgressBar1.Visible = False + ' + 'chklogging + ' + Me.chklogging.AutoSize = True + Me.chklogging.Checked = True + Me.chklogging.CheckState = System.Windows.Forms.CheckState.Checked + Me.chklogging.Location = New System.Drawing.Point(379, 31) + Me.chklogging.Name = "chklogging" + Me.chklogging.Size = New System.Drawing.Size(113, 20) + Me.chklogging.TabIndex = 5 + Me.chklogging.Text = "Log errors only" + Me.chklogging.UseVisualStyleBackColor = True + ' + 'btncancel + ' + Me.btncancel.Image = Global.RecordOrganizer_RightManager.My.Resources.Resources.cancel1 + Me.btncancel.ImageAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btncancel.Location = New System.Drawing.Point(369, 128) + Me.btncancel.Name = "btncancel" + Me.btncancel.Size = New System.Drawing.Size(75, 31) + Me.btncancel.TabIndex = 4 + Me.btncancel.Text = "Cancel" + Me.btncancel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btncancel.UseVisualStyleBackColor = True + Me.btncancel.Visible = False + ' + 'btnCheckRights + ' + Me.btnCheckRights.Image = Global.RecordOrganizer_RightManager.My.Resources.Resources._112_RightArrowShort_Blue_24x24_72 + Me.btnCheckRights.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnCheckRights.Location = New System.Drawing.Point(28, 60) + Me.btnCheckRights.Name = "btnCheckRights" + Me.btnCheckRights.Size = New System.Drawing.Size(335, 39) + Me.btnCheckRights.TabIndex = 2 + Me.btnCheckRights.Text = "Check rights for all documents related to this user" + Me.btnCheckRights.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnCheckRights.UseVisualStyleBackColor = True + ' + 'lblstate + ' + Me.lblstate.AutoSize = True + Me.lblstate.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblstate.Location = New System.Drawing.Point(25, 112) + Me.lblstate.Name = "lblstate" + Me.lblstate.Size = New System.Drawing.Size(38, 13) + Me.lblstate.TabIndex = 7 + Me.lblstate.Text = "Label2" + ' + 'frmSupervisorEntity + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(503, 169) + Me.Controls.Add(Me.lblstate) + Me.Controls.Add(Me.chklogging) + Me.Controls.Add(Me.btncancel) + Me.Controls.Add(Me.ProgressBar1) + Me.Controls.Add(Me.btnCheckRights) + Me.Controls.Add(Me.cmbUser) + Me.Controls.Add(Me.Label1) + Me.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog + Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "frmSupervisorEntity" + Me.ShowInTaskbar = False + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Changing Rights for Entity-Supervisor" + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + Friend WithEvents Label1 As System.Windows.Forms.Label + Friend WithEvents cmbUser As System.Windows.Forms.ComboBox + Friend WithEvents btnCheckRights As System.Windows.Forms.Button + Friend WithEvents BW_RightsEntity As System.ComponentModel.BackgroundWorker + Friend WithEvents ProgressBar1 As System.Windows.Forms.ProgressBar + Friend WithEvents btncancel As System.Windows.Forms.Button + Friend WithEvents chklogging As System.Windows.Forms.CheckBox + Friend WithEvents lblstate As System.Windows.Forms.Label +End Class diff --git a/app/RecordOrganizer_RightManager/frmSupervisorEntity.resx b/app/RecordOrganizer_RightManager/frmSupervisorEntity.resx new file mode 100644 index 0000000..91c7d6d --- /dev/null +++ b/app/RecordOrganizer_RightManager/frmSupervisorEntity.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + \ No newline at end of file diff --git a/app/RecordOrganizer_RightManager/frmSupervisorEntity.vb b/app/RecordOrganizer_RightManager/frmSupervisorEntity.vb new file mode 100644 index 0000000..339ea38 --- /dev/null +++ b/app/RecordOrganizer_RightManager/frmSupervisorEntity.vb @@ -0,0 +1,193 @@ +Imports DD_Rights +Imports System.ComponentModel + +Public Class frmSupervisorEntity + Private DT_FILES As DataTable + Private _error As Boolean = False + Private GUID_WORKING As Integer = 0 + Private CURR_ENTITY As Integer = 0 + Private countfiles As Integer = 0 + Private WorkingFiles As Integer = 0 + Private TYPE As String + Private USER_ID As Integer + Private Sub frmCheckRightsEntity_Load(sender As Object, e As EventArgs) Handles Me.Load + lblstate.Visible = False + Refresh_Combo() + End Sub + Sub Refresh_Combo() + Try + cmbUser.DataSource = Nothing + cmbUser.DataSource = DT_WORK_USER_CONTROL_SUPERVISOR + cmbUser.ValueMember = DT_WORK_USER_CONTROL_SUPERVISOR.Columns(0).ColumnName + cmbUser.DisplayMember = DT_WORK_USER_CONTROL_SUPERVISOR.Columns(2).ColumnName + If DT_WORK_USER_CONTROL_SUPERVISOR.Rows.Count = 0 Then + MsgBox("No more Users to rework. Form will be closed!", MsgBoxStyle.Information) + Me.Close() + End If + Catch ex As Exception + MsgBox("Unexpected error in load Users List: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) + End Try + End Sub + + Private Sub btnCheckRights_Click(sender As Object, e As EventArgs) Handles btnCheckRights.Click + Dim ECM_USER_ID As Integer + If cmbUser.SelectedIndex <> -1 Then + GUID_WORKING = 0 + Try + If cmbUser.Text.Contains("SUPERVISOR DELETED") Then + TYPE = "SUPERVISOR DELETED" + ElseIf cmbUser.Text.Contains("SUPERVISOR DELETED") Then + TYPE = "SUPERVISOR ADDED" + Else + TYPE = "" + End If + USER_ID = 0 + Dim expression As String + expression = "GUID = " & cmbUser.SelectedValue + Dim foundRowsLevel0() As DataRow + ' Use the Select method to find all rows matching the filter. + foundRowsLevel0 = DT_WORK_USER_CONTROL_SUPERVISOR.Select(expression) + Dim i As Integer + Dim NODE_CONFIG_ID + ' For each row + For i = 0 To foundRowsLevel0.GetUpperBound(0) + USER_ID = foundRowsLevel0(i)("USER_ID") + CURR_ENTITY = foundRowsLevel0(i)("ENTITY_ID") + Next + Try + ECM_USER_ID = ClassDatabase.Execute_Scalar(String.Format("SELECT USERID_FK_INT_ECM FROM TBDD_USER WHERE GUID = (SELECT USER_ID FROM TBPMO_USER_RIGHTS_JOBS WHERE GUID = {0} )", cmbUser.SelectedValue)) + Catch ex As Exception + MsgBox("No User ECM-ID found for selected User. Please inform Digital Data.", MsgBoxStyle.Exclamation) + Exit Sub + End Try + + + 'Dim sql = String.Format("SELECT ENTITY_ID FROM VWPMO_WD_DOC_SEARCH where DocID in (SELECT [dwObjectID] FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwUserOrGroupID = {0}) GROUP BY ENTITY_ID", ECM_USER_ID) + 'Dim DT_ENTITY As DataTable = ClassDatabase.Return_Datatable(sql) + 'If DT_ENTITY.Rows.Count = 0 Then + ' MsgBox("No files found for User. Job will be terminated!") + ' Finish_Job() + ' Exit Sub + 'End If + + + Dim sql = String.Format("SELECT * FROM VWPMO_WD_DOC_SEARCH where DocID in (SELECT [dwObjectID] FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwUserOrGroupID = {0}) AND ENTITY_ID = {1}", ECM_USER_ID, CURR_ENTITY) + DT_FILES = ClassDatabase.Return_Datatable(sql) + If DT_FILES.Rows.Count = 0 Then + MsgBox("No files found for User. Job will be terminated!") + Finish_Job() + Exit Sub + End If + If DD_Rights.ClassRights.Init(CURR_ENTITY, chklogging.Checked, DT_FILES.Rows.Count) = False Then + MsgBox("Could not init rights management. " & vbNewLine & "Check logfile", MsgBoxStyle.Critical) + Exit Sub + End If + 'BackgroundWorker erstellen ... + BW_RightsEntity = New BackgroundWorker + BW_RightsEntity.WorkerReportsProgress = True + ProgressBar1.Maximum = DT_FILES.Rows.Count + countfiles = DT_FILES.Rows.Count + WorkingFiles = 0 + lblstate.Visible = True + lblstate.Text = "Starting Background Worker...." + Me.ProgressBar1.Visible = True + GUID_WORKING = cmbUser.SelectedValue + AddHandler BW_RightsEntity.DoWork, AddressOf bw_DoWork + + '.. und starten + BW_RightsEntity.RunWorkerAsync() + + + Catch ex As Exception + MsgBox("Unexpected error in starting backgroundworker: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) + Me.ProgressBar1.Visible = False + End Try + End If + + + End Sub + + Private Sub BW_RightsEntity_ProgressChanged(sender As Object, e As ProgressChangedEventArgs) Handles BW_RightsEntity.ProgressChanged + Dim state = "Working on file '" & WorkingFiles.ToString & "' of '" & countfiles.ToString & "'" + lblstate.Text = state + Me.ProgressBar1.Value = e.ProgressPercentage + End Sub + Private Sub bw_DoWork(ByVal sender As Object, ByVal e As DoWorkEventArgs) + Dim worker As BackgroundWorker = CType(sender, BackgroundWorker) + _error = False + Dim i As Integer = 1 + 'Jede Datei einzeln verarbeiten + For Each row As DataRow In DT_FILES.Rows + If BW_RightsEntity.CancellationPending = True Then + e.Cancel = True + Exit For + Else + WorkingFiles += 1 + Select Case TYPE + Case "SUPERVISOR DELETED" + Dim AD_DOMAIN_USER = CStr(DD_Rights.ClassRights.AD_DOMAIN & "\" & Environment.UserName.ToUpper).ToUpper + If DD_Rights.ClassRights.File_DeleteRemoveRight(row.Item("DocID"), row.Item("FULL_FILENAME"), AD_DOMAIN_USER) Then + If DD_Rights.ClassRights.MSG_RESULT <> "" Then + MsgBox("Unexpected Errors in setting rights: " & vbNewLine & DD_Rights.ClassRights.MSG_RESULT, MsgBoxStyle.Exclamation) + _error = True + Else + If DD_Rights.ClassRights.Collect_MainUsers(row.Item("ENTITY_ID"), USER_ID, row.Item("RECORD_ID")) Then + If ClassRights.DT_USER_RIGHTS.Rows.Count > 0 Then + ClassLogger.Add(">> User owns rights for File/Record - right will be set!", False) + If ClassRights.File_DeleteAndSetRight(row.Item("DocID"), row.Item("FULL_FILENAME"), False) Then + + End If + End If + + End If + End If + Else + ClassLogger.Add(">> Unexpected Error in ClassRights.File_DeleteRemoveRight. Check Log.") + _error = True + End If + Case "SUPERVISOR ADDED" + MsgBox("Function actually not added!", MsgBoxStyle.Information) + End Select + + + If BW_RightsEntity.CancellationPending = False And BW_RightsEntity.IsBusy Then + BW_RightsEntity.ReportProgress(i) + End If + + i += 1 + End If + Next + DD_Rights.ClassRights.Finalize_SettingRights() + End Sub + + Private Sub btncancel_Click(sender As Object, e As EventArgs) Handles btncancel.Click + ' Cancel the asynchronous operation. + Me.BW_RightsEntity.CancelAsync() + + End Sub + + Private Sub BW_RightsEntity_RunWorkerCompleted(sender As Object, e As RunWorkerCompletedEventArgs) Handles BW_RightsEntity.RunWorkerCompleted + Try + btncancel.Visible = False + ProgressBar1.Visible = False + lblstate.Visible = False + If _error = False Then + Finish_Job() + MsgBox("All rights of files belonging to entity/User were checked and refreshed successfully!", MsgBoxStyle.Information) + Else + MsgBox("Some errors occured while checking and setting the rights...please check the log!" & vbNewLine & "Current Entity: " & CURR_ENTITY.ToString, MsgBoxStyle.Exclamation) + End If + Catch ex As Exception + + End Try + End Sub + Sub Finish_Job() + Dim upd = String.Format("UPDATE TBPMO_USER_RIGHTS_JOBS SET WORKED = 1, CHANGED_WHO = 'JOB-RIGHTS FINISHER' WHERE GUID = {0}", GUID_WORKING) + If ClassDatabase.Execute_non_Query(upd) = True Then + 'Überprüfen ob es User gibt die aktualisiert werden müssen + Dim Sql = SQL_USER_RIGHTS_CHANGED + DT_WORK_USER_RIGHTS = ClassDatabase.Return_Datatable(Sql) + Refresh_Combo() + End If + End Sub +End Class \ No newline at end of file