diff --git a/app/DD-Record-Organiser/ClassDOC_SEARCH.vb b/app/DD-Record-Organiser/ClassDOC_SEARCH.vb index 75013ec..4ca1b55 100644 --- a/app/DD-Record-Organiser/ClassDOC_SEARCH.vb +++ b/app/DD-Record-Organiser/ClassDOC_SEARCH.vb @@ -268,8 +268,8 @@ Public Class ClassDOC_SEARCH End Function 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 + DD_Rights.clsLogger.Init(Application.UserAppDataPath() & "\Log", Environment.UserName) + If DD_Rights.clsDatabase.Init(MyConnectionString) = True Then If DD_Rights.ClassRights.Init(ENTITY_ID, LogErrorsOnly) = 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 diff --git a/app/DD-Record-Organiser/frmConfiguration_Basic.vb b/app/DD-Record-Organiser/frmConfiguration_Basic.vb index 7228e1c..19e6132 100644 --- a/app/DD-Record-Organiser/frmConfiguration_Basic.vb +++ b/app/DD-Record-Organiser/frmConfiguration_Basic.vb @@ -36,7 +36,7 @@ Public Class frmConfiguration_Basic PWplainText = wrapper.DecryptData(dt.Rows(0).Item("AD_USER_PW")) Me.txtPW.Text = PWplainText Catch ex As Exception - ClassLogger.Add("- the Password '" & dt.Rows(0).Item("AD_USER_PW") & "' could not be decrypted", False) + clsLogger.Add("- the Password '" & dt.Rows(0).Item("AD_USER_PW") & "' could not be decrypted", False) Me.txtPW.Text = "" End Try Me.txtServername.Text = dt.Rows(0).Item("AD_SERVER") @@ -143,7 +143,7 @@ Public Class frmConfiguration_Basic Private Sub btnTest_Anmeldung_Click(sender As Object, e As EventArgs) Handles btnTest_Anmeldung.Click Try - DD_Rights.ClassLogger.Init(Application.UserAppDataPath() & "\Log", Environment.UserName) + DD_Rights.clsLogger.Init(Application.UserAppDataPath() & "\Log", Environment.UserName) Dim session = DD_Rights.ClassRights.GetWMSessionAsUser(Me.txtDomäne.Text, Me.txtServername.Text, Me.txtUser.Text, Me.txtPW.Text) If Not IsNothing(session) Then MsgBox("The persionalized connection to windream was created successfully!", MsgBoxStyle.Information) diff --git a/app/RecordOrganizer_RightManager/frmCheckRightsEntity.vb b/app/RecordOrganizer_RightManager/frmCheckRightsEntity.vb index 88793fe..fa5a78e 100644 --- a/app/RecordOrganizer_RightManager/frmCheckRightsEntity.vb +++ b/app/RecordOrganizer_RightManager/frmCheckRightsEntity.vb @@ -11,7 +11,7 @@ Public Class frmCheckRightsEntity Private Sub frmCheckRightsEntity_Load(sender As Object, e As EventArgs) Handles Me.Load Try Dim sql = String.Format("SELECT T.FORM_ID, [dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), T.[FORM_VIEW_ID]), 1) AS FORM_TITLE FROM VWPMO_CONSTRUCTOR_FORMS T WHERE DOCUMENT_VIEW = 1", USER_LANGUAGE) - Dim DT As DataTable = ClassDatabase.Return_Datatable(sql) + Dim DT As DataTable = clsDatabase.Return_Datatable(sql) cmbentity.DataSource = DT cmbentity.ValueMember = DT.Columns(0).ColumnName cmbentity.DisplayMember = DT.Columns(1).ColumnName @@ -31,9 +31,9 @@ Public Class frmCheckRightsEntity BW_RightsEntity = New BackgroundWorker BW_RightsEntity.WorkerReportsProgress = True BW_RightsEntity.WorkerSupportsCancellation = True - Dim MAX_DOC_ID = ClassDatabase.Execute_Scalar("SELECT DOC_ID FROM TBPMO_KONFIGURATION WHERE GUID = 1", False) + Dim MAX_DOC_ID = clsDatabase.Execute_Scalar("SELECT DOC_ID FROM TBPMO_KONFIGURATION WHERE GUID = 1") 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) + DT_FILES = clsDatabase.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 @@ -97,9 +97,11 @@ Public Class frmCheckRightsEntity 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) + If clsDatabase.Execute_non_Query("UPDATE TBPMO_KONFIGURATION SET DOC_ID = " & CURR_DOCID & " WHERE GUID = 1") = False Then + + End If End If - + @@ -116,7 +118,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) + clsDatabase.Execute_non_Query("UPDATE TBPMO_KONFIGURATION SET DOC_ID = 0 WHERE GUID = 1") Catch ex As Exception End Try diff --git a/app/RecordOrganizer_RightManager/frmReworkUsers.vb b/app/RecordOrganizer_RightManager/frmReworkUsers.vb index 5eb07a4..0cf32b5 100644 --- a/app/RecordOrganizer_RightManager/frmReworkUsers.vb +++ b/app/RecordOrganizer_RightManager/frmReworkUsers.vb @@ -49,7 +49,7 @@ Public Class frmReworkUsers 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)) + ECM_USER_ID = clsDatabase.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 @@ -57,7 +57,7 @@ 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) + Dim DT_ENTITY As DataTable = clsDatabase.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!") @@ -67,7 +67,7 @@ Public Class frmReworkUsers 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) + DT_FILES = clsDatabase.Return_Datatable(sql) If DT_FILES.Rows.Count = 0 Then MsgBox("No files found for User. Job will be terminated!") Finish_Job() @@ -127,7 +127,7 @@ Public Class frmReworkUsers End If Else - ClassLogger.Add(">> Unexpected Error in ClassRights.File_DeleteAndSetRight. Check Log.") + clsLogger.Add(">> Unexpected Error in ClassRights.File_DeleteAndSetRight. Check Log.") _error = True End If Else @@ -171,10 +171,10 @@ Public Class frmReworkUsers 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 + If clsDatabase.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) + DT_WORK_USER_RIGHTS = clsDatabase.Return_Datatable(Sql) Refresh_Combo() End If End Sub diff --git a/app/RecordOrganizer_RightManager/frmStart.Designer.vb b/app/RecordOrganizer_RightManager/frmStart.Designer.vb index 0338158..1c085bf 100644 --- a/app/RecordOrganizer_RightManager/frmStart.Designer.vb +++ b/app/RecordOrganizer_RightManager/frmStart.Designer.vb @@ -29,6 +29,7 @@ Partial Class frmStart Me.Button2 = New System.Windows.Forms.Button() Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage() + Me.chkLogerrorsonly = New System.Windows.Forms.CheckBox() Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage() Me.btnrefreshJobs = New System.Windows.Forms.Button() Me.GridControl1 = New DevExpress.XtraGrid.GridControl() @@ -46,7 +47,7 @@ Partial Class frmStart Me.Label1 = New System.Windows.Forms.Label() Me.VWPMO_RIGHTS_2B_WORKEDTableAdapter = New RecordOrganizer_RightManager.MyDatasetTableAdapters.VWPMO_RIGHTS_2B_WORKEDTableAdapter() Me.TableAdapterManager = New RecordOrganizer_RightManager.MyDatasetTableAdapters.TableAdapterManager() - Me.chkLogerrorsonly = New System.Windows.Forms.CheckBox() + Me.GroupBox1 = New System.Windows.Forms.GroupBox() CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl1.SuspendLayout() Me.XtraTabPage1.SuspendLayout() @@ -55,6 +56,7 @@ Partial Class frmStart CType(Me.VWPMO_RIGHTS_2B_WORKEDBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.GroupBox1.SuspendLayout() Me.SuspendLayout() ' 'Button1 @@ -114,7 +116,7 @@ Partial Class frmStart ' 'XtraTabPage1 ' - Me.XtraTabPage1.Controls.Add(Me.chkLogerrorsonly) + Me.XtraTabPage1.Controls.Add(Me.GroupBox1) Me.XtraTabPage1.Controls.Add(Me.Button1) Me.XtraTabPage1.Controls.Add(Me.Button2) Me.XtraTabPage1.Controls.Add(Me.btnWorkUserRightsSV_ADD) @@ -123,6 +125,16 @@ Partial Class frmStart Me.XtraTabPage1.Size = New System.Drawing.Size(821, 304) Me.XtraTabPage1.Text = "Jobs and Tools" ' + 'chkLogerrorsonly + ' + Me.chkLogerrorsonly.AutoSize = True + Me.chkLogerrorsonly.Location = New System.Drawing.Point(6, 20) + Me.chkLogerrorsonly.Name = "chkLogerrorsonly" + Me.chkLogerrorsonly.Size = New System.Drawing.Size(190, 17) + Me.chkLogerrorsonly.TabIndex = 4 + Me.chkLogerrorsonly.Text = "Service DDRights - Log errors only" + Me.chkLogerrorsonly.UseVisualStyleBackColor = True + ' 'XtraTabPage2 ' Me.XtraTabPage2.AutoScroll = True @@ -278,15 +290,16 @@ Partial Class frmStart Me.TableAdapterManager.Connection = Nothing Me.TableAdapterManager.UpdateOrder = RecordOrganizer_RightManager.MyDatasetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' - 'chkLogerrorsonly + 'GroupBox1 ' - Me.chkLogerrorsonly.AutoSize = True - Me.chkLogerrorsonly.Location = New System.Drawing.Point(624, 43) - Me.chkLogerrorsonly.Name = "chkLogerrorsonly" - Me.chkLogerrorsonly.Size = New System.Drawing.Size(190, 17) - Me.chkLogerrorsonly.TabIndex = 4 - Me.chkLogerrorsonly.Text = "Service DDRights - Log errors only" - Me.chkLogerrorsonly.UseVisualStyleBackColor = True + Me.GroupBox1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.GroupBox1.Controls.Add(Me.chkLogerrorsonly) + Me.GroupBox1.Location = New System.Drawing.Point(614, 43) + Me.GroupBox1.Name = "GroupBox1" + Me.GroupBox1.Size = New System.Drawing.Size(200, 67) + Me.GroupBox1.TabIndex = 6 + Me.GroupBox1.TabStop = False + Me.GroupBox1.Text = "Dienstkonfiguration:" ' 'frmStart ' @@ -302,13 +315,14 @@ Partial Class frmStart CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabControl1.ResumeLayout(False) Me.XtraTabPage1.ResumeLayout(False) - Me.XtraTabPage1.PerformLayout() Me.XtraTabPage2.ResumeLayout(False) Me.XtraTabPage2.PerformLayout() CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.VWPMO_RIGHTS_2B_WORKEDBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() + Me.GroupBox1.ResumeLayout(False) + Me.GroupBox1.PerformLayout() Me.ResumeLayout(False) End Sub @@ -336,5 +350,6 @@ Partial Class frmStart Friend WithEvents colADDED_WHO As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colADDED_WHEN As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents chkLogerrorsonly As System.Windows.Forms.CheckBox + Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox End Class diff --git a/app/RecordOrganizer_RightManager/frmStart.vb b/app/RecordOrganizer_RightManager/frmStart.vb index 28e75ec..997f837 100644 --- a/app/RecordOrganizer_RightManager/frmStart.vb +++ b/app/RecordOrganizer_RightManager/frmStart.vb @@ -3,20 +3,20 @@ Public Class frmStart Private Sub frmStart_Load(sender As Object, e As EventArgs) Handles Me.Load Try - DD_Rights.ClassLogger.Init(Application.UserAppDataPath() & "\Log", Environment.UserName) - If DD_Rights.ClassDatabase.Init(My.Settings.MyConnectionString) = False Then + DD_Rights.clsLogger.Init(Application.UserAppDataPath() & "\Log", Environment.UserName) + If DD_Rights.clsDatabase.Init(My.Settings.MyConnectionString) = False Then MsgBox("Error in Initializing Database. Please check log.", MsgBoxStyle.Critical) Me.Close() End If - chkLogerrorsonly.Checked = CBool(ClassDatabase.Execute_Scalar("SELECT LOG_ERR_ONLY_RIGHTS_MANAGER FROM TBPMO_KONFIGURATION WHERE GUID = 1")) + chkLogerrorsonly.Checked = CBool(clsDatabase.Execute_Scalar("SELECT LOG_ERR_ONLY_RIGHTS_MANAGER FROM TBPMO_KONFIGURATION WHERE GUID = 1")) Dim sql = String.Format("SELECT * FROM TBDD_USER WHERE (LOWER(USERNAME) = LOWER('{0}'))", Environment.UserName) - ClassLogger.Add(">> Login at: " & Now.ToString, False) - ClassLogger.Add(">> Username: " & Environment.UserName, False) - Dim USER_DT As DataTable = ClassDatabase.Return_Datatable(sql) + clsLogger.Add(">> Login at: " & Now.ToString, False) + clsLogger.Add(">> Username: " & Environment.UserName, False) + Dim USER_DT As DataTable = clsDatabase.Return_Datatable(sql) If USER_DT.Rows.Count = 0 Then - ClassLogger.Add(" - User '" & Environment.UserName & "' not listed in Useradminsitration!", False) + clsLogger.Add(" - User '" & Environment.UserName & "' not listed in Useradminsitration!", False) 'MsgBox("Achtung: Sie sind nicht in der Userverwaltung hinterlegt." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:") 'Me.Close() Dim msg = String.Format("You are not listed in the Useradministration." & vbNewLine & "Please contact the admin.") @@ -25,12 +25,12 @@ Public Class frmStart Else USER_GUID = USER_DT.Rows(0).Item("GUID") USERID_FK_INT_ECM = USER_DT.Rows(0).Item("USERID_FK_INT_ECM") - USER_WAN = USER_DT.Rows(0).Item("WAN_ENVIRONMENT") 'ClassDatabase.Execute_Scalar("SELECT WAN_ENVIRONMENT FROM TBDD_USER WHERE GUID = " & USER_GUID, False) + USER_WAN = USER_DT.Rows(0).Item("WAN_ENVIRONMENT") 'clsDatabase.Execute_Scalar("SELECT WAN_ENVIRONMENT FROM TBDD_USER WHERE GUID = " & USER_GUID, False) USER_LANGUAGE = USER_DT.Rows(0).Item("LANGUAGE") USER_DATE_FORMAT = USER_DT.Rows(0).Item("DATE_FORMAT") USER_IS_ADMIN = USER_DT.Rows(0).Item("RECORD_ADMIN") - 'USER_LANGUAGE = ClassDatabase.Execute_Scalar("SELECT LANGUAGE FROM TBDD_USER WHERE GUID = " & USER_GUID, False) - Dim DT_CLIENT_USER As DataTable = ClassDatabase.Return_Datatable("SELECT CLIENT_ID FROM TBDD_CLIENT_USER WHERE USER_ID = " & USER_GUID) + 'USER_LANGUAGE = clsDatabase.Execute_Scalar("SELECT LANGUAGE FROM TBDD_USER WHERE GUID = " & USER_GUID, False) + Dim DT_CLIENT_USER As DataTable = clsDatabase.Return_Datatable("SELECT CLIENT_ID FROM TBDD_CLIENT_USER WHERE USER_ID = " & USER_GUID) 'Dim i As Integer = 0 'For Each row As DataRow In DT_CLIENT_USER.Rows ' If i = 0 Then @@ -44,7 +44,7 @@ Public Class frmStart Dim Right_RO As Boolean = USER_DT.Rows(0).Item("MODULE_RECORD_ORG") If Right_RO = False Then - ClassLogger.Add(" - User: " & Environment.UserName & " nicht für Modul freigegben!", False) + clsLogger.Add(" - User: " & Environment.UserName & " nicht für Modul freigegben!", False) 'MsgBox("Achtung: Sie sind nicht für die Nutzung dieses Moduls freigeschaltet." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:") Dim msg = String.Format("Sie sind nicht für die Nutzung dieses Moduls freigeschaltet." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!") If USER_LANGUAGE <> "de-DE" Then @@ -54,7 +54,7 @@ Public Class frmStart Me.Close() Else sql = String.Format("SELECT * FROM TBPMO_ENTITY_SUPERVISOR WHERE USER_ID = {0}", USER_GUID) - Dim DT As DataTable = ClassDatabase.Return_Datatable(sql) + Dim DT As DataTable = clsDatabase.Return_Datatable(sql) If DT.Rows.Count > 0 Then DT_SUPERVISOR_ENTITY = DT MsgBox("As Supervisor You are only allowed to change entity-related rights!", MsgBoxStyle.Information) @@ -71,20 +71,20 @@ Public Class frmStart End If End If Catch ex As Exception - ClassLogger.Add("Unexpected Error in InitUserLogin: " & ex.Message, True) + clsLogger.Add("Unexpected Error in InitUserLogin: " & ex.Message, True) MsgBox("Unexpected Error in InitUserLogin: " & ex.Message, MsgBoxStyle.Critical) End Try End Sub Sub Check_USER_REWORK() 'Überprüfen ob es User gibt die aktualisiert werden müssen - DT_WORK_USER_RIGHTS = ClassDatabase.Return_Datatable(SQL_USER_RIGHTS_CHANGED) + DT_WORK_USER_RIGHTS = clsDatabase.Return_Datatable(SQL_USER_RIGHTS_CHANGED) If DT_WORK_USER_RIGHTS.Rows.Count > 0 Then btnWorkUserRights.Text = "Userrelations were changed." & vbNewLine & DT_WORK_USER_RIGHTS.Rows.Count.ToString & " Users need to be refreshed!" btnWorkUserRights.Visible = True Else btnWorkUserRights.Visible = False End If - DT_WORK_USER_CONTROL_SUPERVISOR = ClassDatabase.Return_Datatable(SQL_USER_RIGHTS_SUPERVISOR_ADDED) + DT_WORK_USER_CONTROL_SUPERVISOR = clsDatabase.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 @@ -99,7 +99,7 @@ Public Class frmStart End Sub Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click - Process.Start(ClassLogger.DateiSpeicherort) + Process.Start(clsLogger.DateiSpeicherort) End Sub Private Sub btnWorkUserRights_Click(sender As Object, e As EventArgs) Handles btnWorkUserRights.Click @@ -128,7 +128,7 @@ Public Class frmStart End If Catch ex As Exception - ClassLogger.Add("Unexpected Error in Load_Jobs: " & ex.Message, True) + clsLogger.Add("Unexpected Error in Load_Jobs: " & ex.Message, True) MsgBox("Unexpected Error in Load_Jobs: " & ex.Message, MsgBoxStyle.Critical) End Try Cursor = Cursors.Default @@ -144,6 +144,10 @@ Public Class frmStart _set = 1 End If Dim upd = String.Format("UPDATE TBPMO_KONFIGURATION SET LOG_ERR_ONLY_RIGHTS_MANAGER = {0} where GUID = 1", _set) - ClassDatabase.Execute_non_Query(upd) + clsDatabase.Execute_non_Query(upd) + End Sub + + Private Sub chklogerrors_CheckedChanged(sender As Object, e As EventArgs) + End Sub End Class diff --git a/app/RecordOrganizer_RightManager/frmSupervisorEntity.vb b/app/RecordOrganizer_RightManager/frmSupervisorEntity.vb index 339ea38..53cb4a0 100644 --- a/app/RecordOrganizer_RightManager/frmSupervisorEntity.vb +++ b/app/RecordOrganizer_RightManager/frmSupervisorEntity.vb @@ -55,7 +55,7 @@ Public Class frmSupervisorEntity 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)) + ECM_USER_ID = clsDatabase.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 @@ -72,7 +72,7 @@ Public Class frmSupervisorEntity 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) + DT_FILES = clsDatabase.Return_Datatable(sql) If DT_FILES.Rows.Count = 0 Then MsgBox("No files found for User. Job will be terminated!") Finish_Job() @@ -133,7 +133,7 @@ Public Class frmSupervisorEntity 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) + clsLogger.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 @@ -142,7 +142,7 @@ Public Class frmSupervisorEntity End If End If Else - ClassLogger.Add(">> Unexpected Error in ClassRights.File_DeleteRemoveRight. Check Log.") + clsLogger.Add(">> Unexpected Error in ClassRights.File_DeleteRemoveRight. Check Log.") _error = True End If Case "SUPERVISOR ADDED" @@ -183,10 +183,10 @@ Public Class frmSupervisorEntity 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 + If clsDatabase.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) + DT_WORK_USER_RIGHTS = clsDatabase.Return_Datatable(Sql) Refresh_Combo() End If End Sub