Merge branch 'master' of http://git.dd:3000/AppStd/TaskFlow

app/TaskFlow/frmMain.vb

@@ -1517,6 +1517,8 @@ Public Class frmMain
     Private Sub Item_Scope(startedFrom As String)
         Try
 
+            LOGGER.Info("Starting Profile Loading")
+
             If Application.OpenForms().OfType(Of frmValidator).Any Then
                 bsiMessage.Caption = S.Es_existiert_bereits_ein_aktiver_Workflow_
                 LOGGER.Info("Item Scope - Workflow open! - Exit")
@@ -1530,8 +1532,10 @@ Public Class frmMain
             Dim OItemScopeInfo = "No Item so far"
             If startedFrom = "DOUBLECLICK" Then
                 If hitInfo.InGroupRow Then
+                    LOGGER.Debug("User clicked group row.")
                     startedFrom = "CMGROUP"
                 Else
+                    LOGGER.Debug("User clicked normal row.")
                     startedFrom = "CMROW"
                 End If
             End If
@@ -1541,6 +1545,10 @@ Public Class frmMain
             ElseIf hitInfo.InDataRow Then
                 oHitProfilID = GridView_Docs.GetRowCellValue(GridView_Docs.GetDataRowHandleByGroupRowHandle(GridView_Docs.GetParentRowHandle(hitInfo.RowHandle)), GridView_Docs.Columns("PROFILE_ID"))
             End If
+
+            LOGGER.Debug("Clicked ProfileId: [{0}]", oHitProfilID)
+            LOGGER.Debug("Started From: [{0}]", startedFrom)
+
             If Len(oHitProfilID) > 0 Then
                 If oHitProfilID > 0 Then
                     If oHitProfilID <> CURRENT_CLICKED_PROFILE_ID Then
@@ -1550,23 +1558,24 @@ Public Class frmMain
 
                 End If
             End If
+
             If startedFrom = "CMGROUP" Then
-                LOGGER.Debug($"Item Scope - startedFrom: [{startedFrom}]")
+
+                LOGGER.Debug("Loading Child DocIds..")
+
                 Dim oIds As New List(Of Integer)
-                Dim oCount As Integer = 0
+                Dim oGroupRowHandle = hitInfo.RowHandle
-                '-----------------------------
+                Dim oChildRowCount = GridView_Docs.GetChildRowCount(oGroupRowHandle)
-                Dim orows() As Integer = GridView_Docs.GetSelectedRows
+
-                Dim i As Integer
+                For index = 0 To oChildRowCount - 1
-                For i = 0 To orows.Length - 1 Step i + 1
+                    Dim oChildRowHandle = GridView_Docs.GetChildRowHandle(oGroupRowHandle, index)
-                    Dim childRowCount As Integer = GridView_Docs.GetChildRowCount(orows(i))
+                    Dim oRow = GridView_Docs.GetRow(oChildRowHandle)
-                    Dim j As Integer
+                    Dim oDocId = oRow.Item("DocId")
-                    Dim childRowIndex As Integer
+                    oIds.Add(oDocId)
-                    For j = 0 To childRowCount - 1 Step j + 1
-                        childRowIndex = GridView_Docs.GetChildRowHandle(orows(i), j)
-                        Dim oRow = GridView_Docs.GetRow(childRowIndex)
-                        oIds.Add(oRow.item("DocId"))
-                    Next
                 Next
+
+                LOGGER.Debug("[{0}] DocIds loaded", oIds.Count)
+
                 If oIds.Count = 0 Then
                     For index = 0 To GridView_Docs.RowCount
                         Dim oRow = GridView_Docs.GetRow(index)
@@ -1579,13 +1588,10 @@ Public Class frmMain
 
                         If oProfileId = CURRENT_CLICKED_PROFILE_ID Then
                             oIds.Add(oRow.item("DocId"))
-                            oCount += 1
                         End If
                     Next
                 End If
-                If oIds.Count = 0 Then
 
-                End If
                 ' -----------------------------
 
                 If oIds.Count = 0 Then
@@ -1594,21 +1600,19 @@ Public Class frmMain
                     'MsgBox("System konnte die Profilworkflows nicht auswerten!" & vbNewLine & "Bitte wählen Sie ein Profil durch Klicken auf einen Beleg oder eine Überschrift!", MsgBoxStyle.Information, ADDITIONAL_TITLE)
                     Exit Sub
                 End If
+                LOGGER.Debug("Cleaning up queued DocIds..")
                 Dim oDelete = $"DELETE FROM TBPM_VALIDATION_PROFILE_GROUP_USER WHERE UserID = {USER_ID}"
                 If DatabaseFallback.ExecuteNonQueryECM(oDelete) = True Then
+                    LOGGER.Debug("Adding [{0}] queued DocIds..", oIds.Count)
                     For Each oID As Integer In oIds
                         Dim oInsert = $"INSERT INTO TBPM_VALIDATION_PROFILE_GROUP_USER ([PROFIL_ID] ,[DocID]
                         ,[UserID] ,[ADDED_WHO]) VALUES ({CURRENT_CLICKED_PROFILE_ID},{oID},{USER_ID},'{USER_USERNAME}')"
                         DatabaseFallback.ExecuteNonQueryECM(oInsert)
-
                     Next
                 End If
 
             End If
 
-
-
-
             'GridView_Docs.EndSelection()
             CURRENT_JUMP_DOC_GUID = 0
 

app/TaskFlow/frmValidator.resx

@@ -344,7 +344,7 @@
     <value>DocumentViewerValidator</value>
   </data>
   <data name="&gt;&gt;DocumentViewerValidator.Type" xml:space="preserve">
-    <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.9.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.9.2.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;DocumentViewerValidator.Parent" xml:space="preserve">
     <value>SplitContainer1.Panel2</value>

app/TaskFlow/frmValidator.vb

@@ -3609,6 +3609,7 @@ Public Class frmValidator
         Catch ex As Exception
 
         End Try
+
         Try
             If RibbonPageCustTitle <> "" Then
                 RibbonPageGroupCustom.Text = RibbonPageCustTitle
@@ -3618,7 +3619,13 @@ Public Class frmValidator
             End If
             If Not (IsNothing(WMDocPathWindows) And ActiveWorkflowType = ConstAHWorkflow_BlindFile) Then
                 If ButtonExport2Folder_Caption <> "" And WMDocPathWindows <> "" Then
+                    Logger.Debug("Enabling Export2File, Caption set")
+                    Logger.Debug("Button Caption: [{0}]", ButtonExport2Folder_Caption)
+                    Logger.Debug("Export root folder: [{0}]", ButtonExport2Folder_RootFolder)
+
                     If File.Exists(WMDocPathWindows) Then
+                        Logger.Debug("File exists, Showing Export Button")
+
                         barbtnitmExport.Caption = ButtonExport2Folder_Caption
                         If ButtonExport2Folder_Mode <> String.Empty Then
                             barbtnitmExport.Tag = ButtonExport2Folder_Mode
@@ -3628,11 +3635,13 @@ Public Class frmValidator
                             If ButtonExport2Folder_RootFolder <> "" Then
                                 If Directory.Exists(ButtonExport2Folder_RootFolder) Then
                                     If CONFIG.Config.LastExportPath <> String.Empty Then
+                                        Logger.Debug("Last export path exists, using as default path")
                                         FolderBrowserDialog1.SelectedPath = CONFIG.Config.LastExportPath
                                     Else
                                         FolderBrowserDialog1.SelectedPath = ButtonExport2Folder_RootFolder
                                     End If
 
+                                    Logger.Debug("Setting default export path to [{0}]", FolderBrowserDialog1.SelectedPath)
                                 Else
                                     Logger.Warn($"### Dis/Enabale Export2Path - RootFolder {ButtonExport2Folder_RootFolder} not existing or accessible!###")
                                 End If
@@ -3645,6 +3654,7 @@ Public Class frmValidator
                     End If
                 End If
             End If
+
         Catch ex As Exception
             Logger.Error(ex)
         End Try