MS1808

2016-08-18 10:58:31 +02:00
parent fd0e907262
commit bcee2404d5
30 changed files with 9903 additions and 8876 deletions
--- a/app/RecordOrganizer_RightManager/ModuleMySettings.vb
+++ b/app/RecordOrganizer_RightManager/ModuleMySettings.vb
@@ -8,4 +8,6 @@
    Public USER_WAN As Boolean = False
    Public DT_WORK_USER_RIGHTS As DataTable
    Public DT_SUPERVISOR_ENTITY 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"
 End Module
--- a/app/RecordOrganizer_RightManager/frmCheckRightsEntity.Designer.vb
+++ b/app/RecordOrganizer_RightManager/frmCheckRightsEntity.Designer.vb
@@ -29,11 +29,12 @@ Partial Class frmCheckRightsEntity
        Me.ProgressBar1 = New System.Windows.Forms.ProgressBar()
        Me.btncancel = New System.Windows.Forms.Button()
        Me.chklogging = New System.Windows.Forms.CheckBox()
-        Me.SuspendLayout
+        Me.lblstate = New System.Windows.Forms.Label()
+        Me.SuspendLayout()
        '
        'Label1
        '
-        Me.Label1.AutoSize = true
+        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)
@@ -42,7 +43,7 @@ Partial Class frmCheckRightsEntity
        '
        'cmbentity
        '
-        Me.cmbentity.FormattingEnabled = true
+        Me.cmbentity.FormattingEnabled = True
        Me.cmbentity.Location = New System.Drawing.Point(28, 29)
        Me.cmbentity.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
        Me.cmbentity.Name = "cmbentity"
@@ -56,49 +57,60 @@ Partial Class frmCheckRightsEntity
        Me.btnCheckRights.Size = New System.Drawing.Size(335, 39)
        Me.btnCheckRights.TabIndex = 2
        Me.btnCheckRights.Text = "Check rights for all documents in this entity"
-        Me.btnCheckRights.UseVisualStyleBackColor = true
+        Me.btnCheckRights.UseVisualStyleBackColor = True
        '
        'BW_RightsEntity
        '
        '
        'ProgressBar1
        '
-        Me.ProgressBar1.Location = New System.Drawing.Point(28, 108)
+        Me.ProgressBar1.Location = New System.Drawing.Point(28, 130)
        Me.ProgressBar1.Name = "ProgressBar1"
        Me.ProgressBar1.Size = New System.Drawing.Size(335, 31)
        Me.ProgressBar1.TabIndex = 3
-        Me.ProgressBar1.Visible = false
+        Me.ProgressBar1.Visible = False
        '
        '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, 108)
+        Me.btncancel.Location = New System.Drawing.Point(369, 130)
        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
+        Me.btncancel.UseVisualStyleBackColor = True
+        Me.btncancel.Visible = False
        '
        'chklogging
        '
-        Me.chklogging.AutoSize = true
-        Me.chklogging.Checked = true
+        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
+        Me.chklogging.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(28, 111)
+        Me.lblstate.Name = "lblstate"
+        Me.lblstate.Size = New System.Drawing.Size(38, 13)
+        Me.lblstate.TabIndex = 6
+        Me.lblstate.Text = "Label2"
        '
        'frmCheckRightsEntity
        '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(7!, 16!)
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(503, 161)
+        Me.ClientSize = New System.Drawing.Size(503, 173)
+        Me.Controls.Add(Me.lblstate)
        Me.Controls.Add(Me.chklogging)
        Me.Controls.Add(Me.btncancel)
        Me.Controls.Add(Me.ProgressBar1)
@@ -111,7 +123,8 @@ Partial Class frmCheckRightsEntity
        Me.MaximizeBox = False
        Me.MinimizeBox = False
        Me.Name = "frmCheckRightsEntity"
-        Me.ShowInTaskbar = false
+        Me.ShowInTaskbar = False
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
        Me.Text = "Check Rights for Entity"
        Me.ResumeLayout(false)
        Me.PerformLayout
@@ -124,4 +137,5 @@ End Sub
    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
--- a/app/RecordOrganizer_RightManager/frmCheckRightsEntity.vb
+++ b/app/RecordOrganizer_RightManager/frmCheckRightsEntity.vb
@@ -1,9 +1,11 @@
-Imports DD
+Imports DD_Rights
 Imports System.ComponentModel

 Public Class frmCheckRightsEntity
    Private DT_FILES As DataTable
    Private _error As Boolean = False
+    Private countfiles As Integer = 0
+    Private WorkingFiles As Integer = 0
    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)
@@ -11,6 +13,7 @@ Public Class frmCheckRightsEntity
            cmbentity.DataSource = DT
            cmbentity.ValueMember = DT.Columns(0).ColumnName
            cmbentity.DisplayMember = DT.Columns(1).ColumnName
+            lblstate.Visible = False
        Catch ex As Exception
            MsgBox("Unexpected error in load form: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
        End Try
@@ -28,6 +31,11 @@ Public Class frmCheckRightsEntity
                    MsgBox("Could not init rights management. " & vbNewLine & "Check logfile", MsgBoxStyle.Critical)
                    Exit Sub
                End If
+                btncancel.Visible = True
+                lblstate.Visible = True
+                lblstate.Text = "Starting Background Worker...."
+                countfiles = DT_FILES.Rows.Count - 1
+                WorkingFiles = 0
                ProgressBar1.Maximum = DT_FILES.Rows.Count
                AddHandler BW_RightsEntity.DoWork, AddressOf bw_DoWork
                '.. und starten
@@ -40,6 +48,8 @@ Public Class frmCheckRightsEntity
    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)
@@ -53,7 +63,8 @@ Public Class frmCheckRightsEntity
                Exit For
            Else
                If DD_Rights.ClassRights.Collect_Users(row.Item("RECORD_ID")) = True Then
-                    If DD_Rights.ClassRights.File_DeleteAndSetRight(row.Item("FULL_FILENAME"), 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
                            MsgBox("Unexpected Errors in setting rights: " & vbNewLine & DD_Rights.ClassRights.MSG_RESULT, MsgBoxStyle.Exclamation)
                            _error = True
@@ -81,6 +92,7 @@ Public Class frmCheckRightsEntity
    Private Sub BW_RightsEntity_RunWorkerCompleted(sender As Object, e As RunWorkerCompletedEventArgs) Handles BW_RightsEntity.RunWorkerCompleted
        Try
            btncancel.Visible = False
+            lblstate.Visible = False
            ProgressBar1.Visible = False
            If _error = False Then
                MsgBox("All rights of files belonging to entity were checked and refreshed successfully!", MsgBoxStyle.Information)
--- a/app/RecordOrganizer_RightManager/frmReworkUsers.Designer.vb
+++ b/app/RecordOrganizer_RightManager/frmReworkUsers.Designer.vb
@@ -29,6 +29,7 @@ Partial Class frmReworkUsers
        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
@@ -54,7 +55,7 @@ Partial Class frmReworkUsers
        '
        'ProgressBar1
        '
-        Me.ProgressBar1.Location = New System.Drawing.Point(28, 108)
+        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
@@ -76,7 +77,7 @@ Partial Class frmReworkUsers
        '
        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, 108)
+        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
@@ -97,11 +98,22 @@ Partial Class frmReworkUsers
        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"
+        '
        'frmReworkUsers
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(503, 161)
+        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)
@@ -128,4 +140,5 @@ End Sub
    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
--- a/app/RecordOrganizer_RightManager/frmReworkUsers.vb
+++ b/app/RecordOrganizer_RightManager/frmReworkUsers.vb
@@ -8,7 +8,10 @@ Public Class frmReworkUsers
    Private COUNT_ENTITIES As Integer = 0
    Private ENTITIES_WORKED As Integer = 0
    Private CURR_ENTITY As Integer = 0
+    Private countfiles As Integer = 0
+    Private WorkingFiles As Integer = 0
    Private Sub frmCheckRightsEntity_Load(sender As Object, e As EventArgs) Handles Me.Load
+        lblstate.Visible = False
        Refresh_Combo()
    End Sub
    Sub Refresh_Combo()
@@ -17,6 +20,10 @@ Public Class frmReworkUsers
            cmbUser.DataSource = DT_WORK_USER_RIGHTS
            cmbUser.ValueMember = DT_WORK_USER_RIGHTS.Columns(0).ColumnName
            cmbUser.DisplayMember = DT_WORK_USER_RIGHTS.Columns(1).ColumnName
+            If DT_WORK_USER_RIGHTS.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
@@ -43,6 +50,7 @@ Public Class frmReworkUsers
                    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 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
@@ -51,6 +59,10 @@ Public Class frmReworkUsers
                    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
@@ -69,6 +81,8 @@ Public Class frmReworkUsers
    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)
@@ -82,7 +96,8 @@ Public Class frmReworkUsers
                Exit For
            Else
                If DD_Rights.ClassRights.Collect_Users(row.Item("RECORD_ID")) = True Then
-                    If DD_Rights.ClassRights.File_DeleteAndSetRight(row.Item("FULL_FILENAME"), 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
                            MsgBox("Unexpected Errors in setting rights: " & vbNewLine & DD_Rights.ClassRights.MSG_RESULT, MsgBoxStyle.Exclamation)
                            _error = True
@@ -117,12 +132,13 @@ Public Class frmReworkUsers
        Try
            btncancel.Visible = False
            ProgressBar1.Visible = False
+            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 = "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"
+                        Dim Sql = SQL_USER_RIGHTS_CHANGED
                        DT_WORK_USER_RIGHTS = ClassDatabase.Return_Datatable(Sql)
                        Refresh_Combo()
                    End If
--- a/app/RecordOrganizer_RightManager/frmStart.vb
+++ b/app/RecordOrganizer_RightManager/frmStart.vb
@@ -64,15 +64,7 @@ Public Class frmStart
                        Me.Close()
                    End If

-                    'Überprüfen ob es User gibt die aktualisiert werden müssen
-                    sql = "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"
-                    DT_WORK_USER_RIGHTS = ClassDatabase.Return_Datatable(sql)
-                    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
+                    Check_USER_REWORK()

                End If
            End If
@@ -81,7 +73,16 @@ Public Class frmStart
            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)
+        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
+    End Sub
    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
        ' Me.Visible = False
        frmCheckRightsEntity.ShowDialog()
@@ -94,5 +95,6 @@ Public Class frmStart

    Private Sub btnWorkUserRights_Click(sender As Object, e As EventArgs) Handles btnWorkUserRights.Click
        frmReworkUsers.ShowDialog()
+        Check_USER_REWORK()
    End Sub
 End Class