Merge branch '2.6.1-Bugfix-Massenbearbeitung' into 2.7.0-Release

app/TaskFlow/My Project/AssemblyInfo.vb

@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.6.0.0")>
+<Assembly: AssemblyVersion("2.6.1.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>
 <Assembly: NeutralResourcesLanguage("")>

app/TaskFlow/TaskFlow.vbproj

@@ -456,7 +456,9 @@
     <Compile Include="ClassAnnotation.vb" />
     <Compile Include="ClassConfig.vb" />
     <Compile Include="ClassConstants.vb" />
-    <Compile Include="ClassControlCreator.vb" />
+    <Compile Include="\\dd-gan.local.digitaldata.works\DD-DFSR01\UserObjects\UserFiles\SchreiberM\Downloads\taskFlow\ClassControlCreator.vb">
+      <Link>ClassControlCreator.vb</Link>
+    </Compile>
     <Compile Include="ClassDragDrop.vb" />
     <Compile Include="ClassFinalIndex.vb" />
     <Compile Include="ClassFinalizeDoc.vb" />

app/TaskFlow/frmMain.vb

@@ -2242,50 +2242,84 @@ Public Class frmMain
         Item_Scope("DOUBLECLICK")
     End Sub
 
+    'Private Sub GridViewWorkflows_CustomDrawGroupRow(sender As Object, e As Views.Base.RowObjectCustomDrawEventArgs) Handles GridViewWorkflows.CustomDrawGroupRow
+    '    Try
+    '        ' Added
+    '        If FormOpenClose = True And GridIsLoaded = False Then
+    '            Exit Sub
+    '        End If
+
+    '        Dim info As GridGroupRowInfo = TryCast(e.Info, GridGroupRowInfo)
+    '        Dim view As GridView = sender
+
+    '        If info.Column.FieldName = "GROUP_TEXT" Then
+    '            info.GroupText = info.GroupValueText
+
+    '            Dim oColorString As String = "LightGray"
+    '            Dim oFontColorString As String = "Black"
+    '            Dim oFoundConfig As Boolean = False
+    '            Dim oGROUP_TEXT_COL As String
+    '            If USER_LANGUAGE = "de-DE" Then
+    '                oGROUP_TEXT_COL = "GROUP_TEXT"
+    '            Else
+    '                oGROUP_TEXT_COL = "GROUP_TEXT_LANG"
+    '            End If
+
+
+    '            For Each oProfileRow As DataRow In CURR_DT_VWPM_PROFILE_ACTIVE.Rows
+    '                If oProfileRow.Item(oGROUP_TEXT_COL) = info.GroupValueText Then
+    '                    oFoundConfig = True
+    '                    oColorString = oProfileRow.Item("GROUP_COLOR")
+    '                    oFontColorString = oProfileRow.Item("GROUP_FONT_COLOR")
+    '                    ' Added
+    '                    Exit For
+    '                End If
+    '            Next
+    '            If oFoundConfig = False Then
+    '                LOGGER.Info($"CustomDrawGroupRow: Could not find a ColorConfig for ProfileGroupValueText [{info.GroupValueText}]...")
+    '                ' Added
+    '                Exit Sub
+    '            End If
+
+    '            Dim oColor As Color = ParseColorString(oColorString, Color.LightGray, "Background Color")
+    '            Dim oFontColor As Color = ParseColorString(oFontColorString, Color.Black, "Font Color")
+
+    '            info.Appearance.BackColor = oColor
+    '            info.Appearance.ForeColor = oFontColor
+    '        End If
+    '    Catch ex As Exception
+    '        LOGGER.Error(ex)
+    '    End Try
+    'End Sub
+
     Private Sub GridViewWorkflows_CustomDrawGroupRow(sender As Object, e As Views.Base.RowObjectCustomDrawEventArgs) Handles GridViewWorkflows.CustomDrawGroupRow
         Try
-            ' Added
+
             If FormOpenClose = True And GridIsLoaded = False Then
                 Exit Sub
             End If
 
-            Dim info As GridGroupRowInfo = TryCast(e.Info, GridGroupRowInfo)
+            Dim oInfo As GridGroupRowInfo = TryCast(e.Info, GridGroupRowInfo)
-            Dim view As GridView = sender
+            If oInfo Is Nothing OrElse oInfo.Column Is Nothing Then
+                Exit Sub
+            End If
 
-            If info.Column.FieldName = "GROUP_TEXT" Then
+            Dim oView As GridView = sender
-                info.GroupText = info.GroupValueText
+
+            If oInfo.Column.FieldName = "GROUP_TEXT" Then
+                oInfo.GroupText = oInfo.GroupValueText
 
                 Dim oColorString As String = "LightGray"
                 Dim oFontColorString As String = "Black"
-                Dim oFoundConfig As Boolean = False
+                Dim oChildRowHandle As Integer = oView.GetChildRowHandle(oInfo.RowHandle, 0)
-                Dim oGROUP_TEXT_COL As String
-                If USER_LANGUAGE = "de-DE" Then
-                    oGROUP_TEXT_COL = "GROUP_TEXT"
-                Else
-                    oGROUP_TEXT_COL = "GROUP_TEXT_LANG"
-                End If
 
-
+                oColorString = oView.GetRowCellValue(oChildRowHandle, "GROUP_COLOR")
-                For Each oProfileRow As DataRow In CURR_DT_VWPM_PROFILE_ACTIVE.Rows
-                    If oProfileRow.Item(oGROUP_TEXT_COL) = info.GroupValueText Then
-                        oFoundConfig = True
-                        oColorString = oProfileRow.Item("GROUP_COLOR")
-                        oFontColorString = oProfileRow.Item("GROUP_FONT_COLOR")
-                        ' Added
-                        Exit For
-                    End If
-                Next
-                If oFoundConfig = False Then
-                    LOGGER.Info($"CustomDrawGroupRow: Could not find a ColorConfig for ProfileGroupValueText [{info.GroupValueText}]...")
-                    ' Added
-                    Exit Sub
-                End If
 
                 Dim oColor As Color = ParseColorString(oColorString, Color.LightGray, "Background Color")
                 Dim oFontColor As Color = ParseColorString(oFontColorString, Color.Black, "Font Color")
 
-                info.Appearance.BackColor = oColor
+                oInfo.Appearance.BackColor = oColor
-                info.Appearance.ForeColor = oFontColor
+                oInfo.Appearance.ForeColor = oFontColor
             End If
         Catch ex As Exception
             LOGGER.Error(ex)
@@ -3258,7 +3292,7 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
 
                     LOGGER.Debug($"oTargetPath with NowParams: {oTargetPath}")
 
-                    Dim oResult = WINDREAM_MOD.NewFileStream(oSourcePath, oTargetPath, oWMObjecttype, True)
+                    Dim oResult = WINDREAM_MOD.NewFileStream(oSourcePath, oTargetPath, oWMObjecttype)
                     If oResult = True Then
                         WM_AHWF_docPath = oTargetPath
                         Dim oDocID = WINDREAM_MOD.NewDocumentID

app/TaskFlow/frmMassValidator.vb

@@ -1339,15 +1339,14 @@ Public Class frmMassValidator
         Dim oSQL = $"SELECT [dbo].[FNPM_GET_WM_FILE_PATH] ({CURRENT_DOC_GUID},{_CheckStandard})"
         oResult = DatabaseFallback.GetScalarValueECM(oSQL)
         LOGGER.Debug($"Checking file 0 GDP [{oResult}] exists?...")
+        LOGGER.Debug($"GetWMDocPathWindows returned false - trying with standard again...")
+        oSQL = $"SELECT [dbo].[FNPM_GET_WM_FILE_PATH] ({CURRENT_DOC_GUID},1)"
+        oResult = DatabaseFallback.GetScalarValueECM(oSQL)
+        LOGGER.Debug($"Checking file 1 GDP [{oResult}] exists?...")
         If File.Exists(oResult) = False Then
-            LOGGER.Debug($"GetWMDocPathWindows returned false - trying with standard again...")
+            Return False
-            oSQL = $"SELECT [dbo].[FNPM_GET_WM_FILE_PATH] ({CURRENT_DOC_GUID},1)"
-            oResult = DatabaseFallback.GetScalarValueECM(oSQL)
-            LOGGER.Debug($"Checking file 1 GDP [{oResult}] exists?...")
-            If File.Exists(oResult) = False Then
-                Return False
-            End If
         End If
+
         WMDocPathWindows = oResult
 
         CURRENT_DOC_PATH = WMDocPathWindows