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

app/TaskFlow/ClassControlCreator.vb

@@ -559,8 +559,8 @@ Public Class ClassControlCreator
 
         Dim oDataTable = oGridControlCreator.CreateGridColumns(DT_MY_COLUMNS)
         GridTables = oGridControlCreator.FillGridTables(DT_MY_COLUMNS, oControlId, oControl.Name)
-        oView.PopulateColumns(oDatatable)
+        oView.PopulateColumns(oDataTable)
-        oControl.DataSource = oDatatable
+        oControl.DataSource = oDataTable
         oControl.RefreshDataSource()
         oControl.ForceInitialize()
 

app/TaskFlow/TaskFlow.vbproj

@@ -81,10 +81,6 @@
     <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
       <HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
     </Reference>
-    <Reference Include="DD_LIB_Standards, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>P:\Visual Studio Projekte\Bibliotheken\DD_LIB_Standards.dll</HintPath>
-    </Reference>
     <Reference Include="DevExpress.Charts.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
@@ -159,25 +155,31 @@
       <HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.SnapPanel\bin\Debug\DigitalData.Controls.SnapPanel.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.GUIs.Common, Version=2.6.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.GUIs.Common.2.6.2\lib\net462\DigitalData.GUIs.Common.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Base, Version=1.3.8.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Base.1.3.8\lib\net462\DigitalData.Modules.Base.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Config, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Config.1.3.0\lib\net462\DigitalData.Modules.Config.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Database, Version=2.3.5.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Database.2.3.5.4\lib\net462\DigitalData.Modules.Database.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.EDMI.API">
       <HintPath>..\..\..\..\2_DLL Projekte\DDModules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Encryption, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Encryption.1.3.1\lib\net462\DigitalData.Modules.Encryption.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Encryption\bin\Debug\DigitalData.Modules.Encryption.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Filesystem, Version=1.3.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Filesystem.1.3.3\lib\net462\DigitalData.Modules.Filesystem.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Interfaces">
       <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
@@ -189,17 +191,20 @@
       <HintPath>..\..\..\..\2_DLL Projekte\DDModules\License\bin\Debug\DigitalData.Modules.License.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging, Version=2.6.5.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Messaging, Version=1.9.8.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Patterns, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Patterns.1.3.1\lib\net462\DigitalData.Modules.Patterns.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Windows, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Windows.1.5.1\lib\net462\DigitalData.Modules.Windows.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Windows\bin\Debug\DigitalData.Modules.Windows.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Windream, Version=1.9.6.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

app/TaskFlow/frmMain.Designer.vb

@@ -193,6 +193,9 @@ Partial Class frmMain
         Me.TimerInactivity = New System.Windows.Forms.Timer(Me.components)
         Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem9 = New DevExpress.XtraBars.BarButtonItem()
+        Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl()
+        Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage()
+        Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage()
         CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel1.SuspendLayout()
         CType(Me.GridControlWorkflows, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -211,6 +214,8 @@ Partial Class frmMain
         CType(Me.RepositoryItemZoomTrackBar1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.PrintPreviewRepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.XtraTabControl1.SuspendLayout()
         Me.SuspendLayout()
         '
         'ImageListProfile
@@ -1589,11 +1594,29 @@ Partial Class frmMain
         Me.BarButtonItem9.Name = "BarButtonItem9"
         Me.BarButtonItem9.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
         '
+        'XtraTabControl1
+        '
+        resources.ApplyResources(Me.XtraTabControl1, "XtraTabControl1")
+        Me.XtraTabControl1.Name = "XtraTabControl1"
+        Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1
+        Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2})
+        '
+        'XtraTabPage1
+        '
+        Me.XtraTabPage1.Name = "XtraTabPage1"
+        resources.ApplyResources(Me.XtraTabPage1, "XtraTabPage1")
+        '
+        'XtraTabPage2
+        '
+        Me.XtraTabPage2.Name = "XtraTabPage2"
+        resources.ApplyResources(Me.XtraTabPage2, "XtraTabPage2")
+        '
         'frmMain
         '
         Me.Appearance.Options.UseFont = True
         resources.ApplyResources(Me, "$this")
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.Controls.Add(Me.XtraTabControl1)
         Me.Controls.Add(Me.Panel1)
         Me.Controls.Add(Me.RibbonStatusBar1)
         Me.Controls.Add(Me.RibbonControl1)
@@ -1626,6 +1649,8 @@ Partial Class frmMain
         CType(Me.RepositoryItemZoomTrackBar1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.PrintPreviewRepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.XtraTabControl1.ResumeLayout(False)
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -1799,4 +1824,7 @@ Partial Class frmMain
     Friend WithEvents GridViewWorkflows As DevExpress.XtraGrid.Views.Grid.GridView
     Friend WithEvents BSIVERSION1 As DevExpress.XtraBars.BarStaticItem
     Friend WithEvents barbtnitmsaveLogfiles As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl
+    Friend WithEvents XtraTabPage1 As DevExpress.XtraTab.XtraTabPage
+    Friend WithEvents XtraTabPage2 As DevExpress.XtraTab.XtraTabPage
 End Class

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/frmValidator.vb

@@ -43,7 +43,7 @@ Public Class frmValidator
     ''' Contains all grid columns for the current profile
     ''' </summary>
     Private Property DT_COLUMNS_GRID As DataTable
-
+    Private Property GIT_TEST As Boolean = False
     ''' <summary>
     ''' Contains all grid columns for the current profile which have an sql but don't have a reference to a control
     ''' </summary>