MS UserItemsReplace

2019-12-04 13:40:05 +01:00
parent 5daf8617ed
commit 9ad1fe7709
46 changed files with 3229 additions and 1819 deletions
--- a/app/RecordOrganizer_RightManager/frmCheckRightsEntity.Designer.vb
+++ b/app/RecordOrganizer_RightManager/frmCheckRightsEntity.Designer.vb
@@ -30,6 +30,8 @@ Partial Class frmCheckRightsEntity
        Me.btncancel = New System.Windows.Forms.Button()
        Me.chklogging = New System.Windows.Forms.CheckBox()
        Me.lblstate = New System.Windows.Forms.Label()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.txtOverride = New System.Windows.Forms.TextBox()
        Me.SuspendLayout()
        '
        'Label1
@@ -52,7 +54,7 @@ Partial Class frmCheckRightsEntity
        '
        'btnCheckRights
        '
-        Me.btnCheckRights.Location = New System.Drawing.Point(28, 60)
+        Me.btnCheckRights.Location = New System.Drawing.Point(28, 94)
        Me.btnCheckRights.Name = "btnCheckRights"
        Me.btnCheckRights.Size = New System.Drawing.Size(335, 39)
        Me.btnCheckRights.TabIndex = 2
@@ -64,7 +66,7 @@ Partial Class frmCheckRightsEntity
        '
        'ProgressBar1
        '
-        Me.ProgressBar1.Location = New System.Drawing.Point(28, 130)
+        Me.ProgressBar1.Location = New System.Drawing.Point(28, 164)
        Me.ProgressBar1.Name = "ProgressBar1"
        Me.ProgressBar1.Size = New System.Drawing.Size(335, 31)
        Me.ProgressBar1.TabIndex = 3
@@ -74,7 +76,7 @@ Partial Class frmCheckRightsEntity
        '
        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, 130)
+        Me.btncancel.Location = New System.Drawing.Point(369, 164)
        Me.btncancel.Name = "btncancel"
        Me.btncancel.Size = New System.Drawing.Size(75, 31)
        Me.btncancel.TabIndex = 4
@@ -99,17 +101,37 @@ Partial Class frmCheckRightsEntity
        '
        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.Location = New System.Drawing.Point(28, 145)
        Me.lblstate.Name = "lblstate"
        Me.lblstate.Size = New System.Drawing.Size(38, 13)
        Me.lblstate.TabIndex = 6
        Me.lblstate.Text = "Label2"
        '
+        'Label2
+        '
+        Me.Label2.AutoSize = True
+        Me.Label2.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label2.Location = New System.Drawing.Point(28, 60)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(153, 13)
+        Me.Label2.TabIndex = 7
+        Me.Label2.Text = "Optional from Count Override:"
+        '
+        'txtOverride
+        '
+        Me.txtOverride.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtOverride.Location = New System.Drawing.Point(263, 57)
+        Me.txtOverride.Name = "txtOverride"
+        Me.txtOverride.Size = New System.Drawing.Size(100, 21)
+        Me.txtOverride.TabIndex = 8
+        '
        'frmCheckRightsEntity
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(493, 172)
+        Me.ClientSize = New System.Drawing.Size(493, 219)
+        Me.Controls.Add(Me.txtOverride)
+        Me.Controls.Add(Me.Label2)
        Me.Controls.Add(Me.lblstate)
        Me.Controls.Add(Me.chklogging)
        Me.Controls.Add(Me.btncancel)
@@ -138,4 +160,6 @@ End Sub
    Friend WithEvents btncancel As System.Windows.Forms.Button
    Friend WithEvents chklogging As System.Windows.Forms.CheckBox
    Friend WithEvents lblstate As System.Windows.Forms.Label
+    Friend WithEvents Label2 As Label
+    Friend WithEvents txtOverride As TextBox
 End Class
--- a/app/RecordOrganizer_RightManager/frmCheckRightsEntity.vb
+++ b/app/RecordOrganizer_RightManager/frmCheckRightsEntity.vb
@@ -9,6 +9,7 @@ Public Class frmCheckRightsEntity
    Private CURR_DOCID As Integer
    Private CURR_DOCPATH As String
    Private ENTITY_ID As Integer
+    Private OverrideCount As Integer
    Dim righterrors As Boolean = False
    Private Sub frmCheckRightsEntity_Load(sender As Object, e As EventArgs) Handles Me.Load
        Try
@@ -26,6 +27,11 @@ Public Class frmCheckRightsEntity
    Private Sub btnCheckRights_Click(sender As Object, e As EventArgs) Handles btnCheckRights.Click
        If cmbentity.SelectedIndex <> -1 Then
            Try
+                If txtOverride.Text <> "" Then
+                    OverrideCount = CInt(txtOverride.Text)
+                Else
+                    OverrideCount = 0
+                End If
                righterrors = False
                CURR_DOCID = 0
                ENTITY_ID = cmbentity.SelectedValue
@@ -34,8 +40,12 @@ Public Class frmCheckRightsEntity
                BW_RightsEntity = New BackgroundWorker
                BW_RightsEntity.WorkerReportsProgress = True
                BW_RightsEntity.WorkerSupportsCancellation = True
-                Dim sqlfiles = String.Format("SELECT T.DocID,T.FULL_FILENAME,TRL.RECORD_ID,TR.FORM_ID AS [ENTITY_ID] FROM VWPMO_DOC_SEARCH T, TBPMO_DOC_RECORD_LINK TRL, TBPMO_RECORD TR where T.DocID = TRL.DOC_ID AND TRL.RECORD_ID = TR.GUID AND TR.FORM_ID = {0} ORDER BY DocID", ENTITY_ID)
-                DT_FILES = clsDatabase.Return_Datatable(sqlfiles)
+                Dim oSQL = $"SELECT TRL.DOC_ID AS DocID
+,'' as FULL_FILENAME --, [dbo].[FNPMO_GET_WINDREAM_FILE_PATH] (TRL.DOC_ID) as FULL_FILENAME,
+,TRL.RECORD_ID,TR.FORM_ID AS [ENTITY_ID] 
+FROM TBPMO_DOC_RECORD_LINK TRL, TBPMO_RECORD TR where TRL.RECORD_ID = TR.GUID AND TR.FORM_ID = {ENTITY_ID} ORDER BY DocID"
+                ' Dim sqlfiles = String.Format("SELECT T.DocID,T.FULL_FILENAME,TRL.RECORD_ID,TR.FORM_ID AS [ENTITY_ID] FROM VWPMO_DOC_SEARCH T, TBPMO_DOC_RECORD_LINK TRL, TBPMO_RECORD TR where T.DocID = TRL.DOC_ID AND TRL.RECORD_ID = TR.GUID AND TR.FORM_ID = {0} ORDER BY DocID", ENTITY_ID)
+                DT_FILES = clsDatabase.Return_Datatable(oSQL)
                If DD_Rights.ClassWDRights.Init(chklogging.Checked, ClassDatabase.ConnectionStringRM) = False Then
                    MsgBox("Could not init rights management. " & vbNewLine & "Check logfile", MsgBoxStyle.Critical)
                    Exit Sub
@@ -73,6 +83,13 @@ Public Class frmCheckRightsEntity
        Dim i As Integer = 1
        'Jede Datei einzeln verarbeiten
        For Each row As DataRow In DT_FILES.Rows
+            If OverrideCount <> 0 Then
+                If WorkingFiles < OverrideCount Then
+                    WorkingFiles += 1
+                    i += 1
+                    Continue For
+                End If
+            End If
            If BW_RightsEntity.CancellationPending = True Then
                MsgBox("Backgroundworker aborting - check log!", MsgBoxStyle.Critical)
                e.Cancel = True
@@ -82,6 +99,10 @@ Public Class frmCheckRightsEntity
                WorkingFiles += 1
                CURR_DOCID = row.Item("DocID")
                CURR_DOCPATH = row.Item("FULL_FILENAME")
+                If CURR_DOCPATH = String.Empty Then
+                    Dim oSQL = $"SELECT [dbo].[FNPMO_GET_WINDREAM_FILE_PATH] ({CURR_DOCID})"
+                    CURR_DOCPATH = clsDatabase.Execute_Scalar(oSQL)
+                End If
                If DD_Rights.ClassWDRights.Doc_Renew_Rights(CURR_DOCID, CURR_DOCPATH, True) Then
                    If DD_Rights.ClassWDRights.MSG_RESULT <> "" Then
                        righterrors = True
--- a/app/RecordOrganizer_RightManager/frmUsersReworkRights.Designer.vb
+++ b/app/RecordOrganizer_RightManager/frmUsersReworkRights.Designer.vb
@@ -102,7 +102,7 @@ Partial Class frmUsersReworkRights
        '
        'GridViewlUsers2Menue
        '
-        Me.GridViewlUsers2Menue.Appearance.EvenRow.BackColor = System.Drawing.Color.Cyan
+        Me.GridViewlUsers2Menue.Appearance.EvenRow.BackColor = System.Drawing.Color.LightBlue
        Me.GridViewlUsers2Menue.Appearance.EvenRow.Options.UseBackColor = True
        Me.GridViewlUsers2Menue.Appearance.FocusedRow.BackColor = System.Drawing.Color.Fuchsia
        Me.GridViewlUsers2Menue.Appearance.FocusedRow.Options.UseBackColor = True