Finales Bugfix

app/TaskFlow/ClassControlCreator.vb

@@ -824,7 +824,7 @@ Public Class ClassControlCreator
                                 If oMeta.Guid = oControlId AndAlso TypeOf oControl Is GridControl Then
                                     Dim oGrid As GridControl = DirectCast(oControl, GridControl)
                                     DirectCast(oGrid.FocusedView, GridView).FocusInvalidRow()
-                                    Logger.Info("Force-setting Editor for Grid [{0}]", oGrid.Name)
+                                    Logger.Debug("Force-setting Editor for Grid [{0}]", oGrid.Name)
                                     Exit For
                                 End If
                             Catch ex As Exception

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

@@ -451,7 +451,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" />
@@ -547,12 +549,6 @@
     <Compile Include="frmColumn_Detail.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="frmDashboard1.Designer.vb">
-      <DependentUpon>frmDashboard1.vb</DependentUpon>
-    </Compile>
-    <Compile Include="frmDashboard1.vb">
-      <SubType>Form</SubType>
-    </Compile>
     <Compile Include="frmDesignerLayout.Designer.vb">
       <DependentUpon>frmDesignerLayout.vb</DependentUpon>
     </Compile>
@@ -810,10 +806,6 @@
       <DependentUpon>frmColumn_Detail.vb</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmDashboard1.resx">
-      <DependentUpon>frmDashboard1.vb</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="frmDesignerLayout.resx">
       <DependentUpon>frmDesignerLayout.vb</DependentUpon>
       <SubType>Designer</SubType>

app/TaskFlow/clsPatterns.vb

@@ -198,9 +198,10 @@ Public Class clsPatterns
 
             While ContainsPattern(oResult, PATTERN_CTRL)
                 If oTryCounter > MAX_TRY_COUNT Then
-                    LOGGER.Warn($"Max tries in ReplaceControlValues exceeded - Replacing with [0]")
+                    LOGGER.Info($"Max tries in ReplaceControlValues exceeded - Replacing PATTERN_CTRL [{PATTERN_CTRL}] with [0]")
+                    LOGGER.Info($"oResult so far is:{oResult}")
                     oResult = ReplacePattern(oResult, PATTERN_CTRL, 0)
-                    Throw New Exception($"Max tries in ReplaceControlValues exceeded - Result so far [{oResult}].")
+                    Exit While
                 End If
 
                 Dim oControlName As String = GetNextPattern(oResult, PATTERN_CTRL).Value
@@ -255,9 +256,8 @@ Public Class clsPatterns
                             ElseIf oLookupControl3.Properties.SelectedValues.Count = 1 Then
                                 LOGGER.Debug($"LookupControl3 mit genau einem Value")
                                 oReplaceValue = oLookupControl3.Properties.SelectedValues(0)
-
                             Else
-                                LOGGER.Warn($"SelectedValues of LookUpControl scheint empty oder leer zu sein! Ersetzen mit ErrorReplaceValue!")
+                                '    LOGGER.Warn($"SelectedValues of LookUpControl scheint empty oder leer zu sein! Ersetzen mit ErrorReplaceValue!")
                                 oReplaceValue = ERROR_REPLACE_VALUE
                             End If
                             LOGGER.Debug($"oReplaceValue nach Durchlaufen selectedValues: {oReplaceValue}")

app/TaskFlow/frmDashboard1.Designer.vb

@@ -1,231 +0,0 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class frmDashboard1
-    Inherits DevExpress.XtraEditors.XtraForm
-
-    'Form overrides dispose to clean up the component list.
-    <System.Diagnostics.DebuggerNonUserCode()> _
-    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
-        If disposing AndAlso components IsNot Nothing Then
-            components.Dispose()
-        End If
-        MyBase.Dispose(disposing)
-    End Sub
-
-    'Required by the Windows Form Designer
-    Private components As System.ComponentModel.IContainer
-
-    'NOTE: The following procedure is required by the Windows Form Designer
-    'It can be modified using the Windows Form Designer.  
-    'Do not modify it using the code editor.
-    <System.Diagnostics.DebuggerStepThrough()> _
-    Private Sub InitializeComponent()
-        Me.components = New System.ComponentModel.Container()
-        Dim TileItemElement1 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement()
-        Dim TileItemElement2 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement()
-        Dim TileItemElement3 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement()
-        Me.TileBar1 = New DevExpress.XtraBars.Navigation.TileBar()
-        Me.TileBarGroup2 = New DevExpress.XtraBars.Navigation.TileBarGroup()
-        Me.TileBarItem1 = New DevExpress.XtraBars.Navigation.TileBarItem()
-        Me.TileBarItem2 = New DevExpress.XtraBars.Navigation.TileBarItem()
-        Me.TileBarGroup3 = New DevExpress.XtraBars.Navigation.TileBarGroup()
-        Me.TileBarItem3 = New DevExpress.XtraBars.Navigation.TileBarItem()
-        Me.NavigationPane1 = New DevExpress.XtraBars.Navigation.NavigationPane()
-        Me.NavigationPage1 = New DevExpress.XtraBars.Navigation.NavigationPage()
-        Me.NavigationPage2 = New DevExpress.XtraBars.Navigation.NavigationPage()
-        Me.RadialMenu1 = New DevExpress.XtraBars.Ribbon.RadialMenu(Me.components)
-        Me.BarManager1 = New DevExpress.XtraBars.BarManager(Me.components)
-        Me.barDockControlTop = New DevExpress.XtraBars.BarDockControl()
-        Me.barDockControlBottom = New DevExpress.XtraBars.BarDockControl()
-        Me.barDockControlLeft = New DevExpress.XtraBars.BarDockControl()
-        Me.barDockControlRight = New DevExpress.XtraBars.BarDockControl()
-        Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
-        Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
-        CType(Me.NavigationPane1, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.NavigationPane1.SuspendLayout()
-        CType(Me.RadialMenu1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.SuspendLayout()
-        '
-        'TileBar1
-        '
-        Me.TileBar1.Dock = System.Windows.Forms.DockStyle.Top
-        Me.TileBar1.DropDownOptions.BeakColor = System.Drawing.Color.Empty
-        Me.TileBar1.Groups.Add(Me.TileBarGroup2)
-        Me.TileBar1.Groups.Add(Me.TileBarGroup3)
-        Me.TileBar1.Location = New System.Drawing.Point(0, 0)
-        Me.TileBar1.MaxId = 3
-        Me.TileBar1.Name = "TileBar1"
-        Me.TileBar1.ScrollMode = DevExpress.XtraEditors.TileControlScrollMode.ScrollButtons
-        Me.TileBar1.Size = New System.Drawing.Size(796, 133)
-        Me.TileBar1.TabIndex = 0
-        Me.TileBar1.Text = "TileBar1"
-        '
-        'TileBarGroup2
-        '
-        Me.TileBarGroup2.Items.Add(Me.TileBarItem1)
-        Me.TileBarGroup2.Items.Add(Me.TileBarItem2)
-        Me.TileBarGroup2.Name = "TileBarGroup2"
-        Me.TileBarGroup2.Text = "Gruppe 1"
-        '
-        'TileBarItem1
-        '
-        Me.TileBarItem1.DropDownOptions.BeakColor = System.Drawing.Color.Empty
-        TileItemElement1.Text = "TileBarItem1"
-        Me.TileBarItem1.Elements.Add(TileItemElement1)
-        Me.TileBarItem1.Id = 0
-        Me.TileBarItem1.ItemSize = DevExpress.XtraBars.Navigation.TileBarItemSize.Medium
-        Me.TileBarItem1.Name = "TileBarItem1"
-        '
-        'TileBarItem2
-        '
-        Me.TileBarItem2.DropDownOptions.BeakColor = System.Drawing.Color.Empty
-        TileItemElement2.Text = "TileBarItem2"
-        Me.TileBarItem2.Elements.Add(TileItemElement2)
-        Me.TileBarItem2.Id = 1
-        Me.TileBarItem2.ItemSize = DevExpress.XtraBars.Navigation.TileBarItemSize.Wide
-        Me.TileBarItem2.Name = "TileBarItem2"
-        '
-        'TileBarGroup3
-        '
-        Me.TileBarGroup3.Items.Add(Me.TileBarItem3)
-        Me.TileBarGroup3.Name = "TileBarGroup3"
-        Me.TileBarGroup3.Text = "Gruppe 2"
-        '
-        'TileBarItem3
-        '
-        Me.TileBarItem3.AppearanceItem.Normal.BackColor = System.Drawing.Color.DarkTurquoise
-        Me.TileBarItem3.AppearanceItem.Normal.Options.UseBackColor = True
-        Me.TileBarItem3.DropDownOptions.BeakColor = System.Drawing.Color.Empty
-        TileItemElement3.Text = "TileBarItem3"
-        Me.TileBarItem3.Elements.Add(TileItemElement3)
-        Me.TileBarItem3.Id = 2
-        Me.TileBarItem3.ItemSize = DevExpress.XtraBars.Navigation.TileBarItemSize.Medium
-        Me.TileBarItem3.Name = "TileBarItem3"
-        '
-        'NavigationPane1
-        '
-        Me.NavigationPane1.Controls.Add(Me.NavigationPage1)
-        Me.NavigationPane1.Controls.Add(Me.NavigationPage2)
-        Me.NavigationPane1.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.NavigationPane1.Location = New System.Drawing.Point(0, 343)
-        Me.NavigationPane1.Name = "NavigationPane1"
-        Me.NavigationPane1.Pages.AddRange(New DevExpress.XtraBars.Navigation.NavigationPageBase() {Me.NavigationPage1, Me.NavigationPage2})
-        Me.NavigationPane1.RegularSize = New System.Drawing.Size(796, 150)
-        Me.NavigationPane1.SelectedPage = Me.NavigationPage1
-        Me.NavigationPane1.Size = New System.Drawing.Size(796, 150)
-        Me.NavigationPane1.TabIndex = 1
-        Me.NavigationPane1.Text = "NavigationPane1"
-        '
-        'NavigationPage1
-        '
-        Me.NavigationPage1.Caption = "NavigationPage1"
-        Me.NavigationPage1.Name = "NavigationPage1"
-        Me.NavigationPage1.Size = New System.Drawing.Size(660, 77)
-        '
-        'NavigationPage2
-        '
-        Me.NavigationPage2.Caption = "NavigationPage2"
-        Me.NavigationPage2.Name = "NavigationPage2"
-        Me.NavigationPage2.PageText = "sdsdsd"
-        Me.NavigationPage2.Size = New System.Drawing.Size(660, 77)
-        '
-        'RadialMenu1
-        '
-        Me.RadialMenu1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem2)})
-        Me.RadialMenu1.Manager = Me.BarManager1
-        Me.RadialMenu1.Name = "RadialMenu1"
-        '
-        'BarManager1
-        '
-        Me.BarManager1.DockControls.Add(Me.barDockControlTop)
-        Me.BarManager1.DockControls.Add(Me.barDockControlBottom)
-        Me.BarManager1.DockControls.Add(Me.barDockControlLeft)
-        Me.BarManager1.DockControls.Add(Me.barDockControlRight)
-        Me.BarManager1.Form = Me
-        Me.BarManager1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.BarButtonItem1, Me.BarButtonItem2})
-        Me.BarManager1.MaxItemId = 2
-        '
-        'barDockControlTop
-        '
-        Me.barDockControlTop.CausesValidation = False
-        Me.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top
-        Me.barDockControlTop.Location = New System.Drawing.Point(0, 0)
-        Me.barDockControlTop.Manager = Me.BarManager1
-        Me.barDockControlTop.Size = New System.Drawing.Size(796, 0)
-        '
-        'barDockControlBottom
-        '
-        Me.barDockControlBottom.CausesValidation = False
-        Me.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.barDockControlBottom.Location = New System.Drawing.Point(0, 493)
-        Me.barDockControlBottom.Manager = Me.BarManager1
-        Me.barDockControlBottom.Size = New System.Drawing.Size(796, 0)
-        '
-        'barDockControlLeft
-        '
-        Me.barDockControlLeft.CausesValidation = False
-        Me.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left
-        Me.barDockControlLeft.Location = New System.Drawing.Point(0, 0)
-        Me.barDockControlLeft.Manager = Me.BarManager1
-        Me.barDockControlLeft.Size = New System.Drawing.Size(0, 493)
-        '
-        'barDockControlRight
-        '
-        Me.barDockControlRight.CausesValidation = False
-        Me.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right
-        Me.barDockControlRight.Location = New System.Drawing.Point(796, 0)
-        Me.barDockControlRight.Manager = Me.BarManager1
-        Me.barDockControlRight.Size = New System.Drawing.Size(0, 493)
-        '
-        'BarButtonItem1
-        '
-        Me.BarButtonItem1.Caption = "BarButtonItem1"
-        Me.BarButtonItem1.Id = 0
-        Me.BarButtonItem1.Name = "BarButtonItem1"
-        '
-        'BarButtonItem2
-        '
-        Me.BarButtonItem2.Caption = "BarButtonItem2"
-        Me.BarButtonItem2.Id = 1
-        Me.BarButtonItem2.Name = "BarButtonItem2"
-        '
-        'frmDashboard1
-        '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(796, 493)
-        Me.Controls.Add(Me.NavigationPane1)
-        Me.Controls.Add(Me.TileBar1)
-        Me.Controls.Add(Me.barDockControlLeft)
-        Me.Controls.Add(Me.barDockControlRight)
-        Me.Controls.Add(Me.barDockControlBottom)
-        Me.Controls.Add(Me.barDockControlTop)
-        Me.Name = "frmDashboard1"
-        Me.Text = "frmDashboard1"
-        CType(Me.NavigationPane1, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.NavigationPane1.ResumeLayout(False)
-        CType(Me.RadialMenu1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.ResumeLayout(False)
-        Me.PerformLayout()
-
-    End Sub
-
-    Friend WithEvents TileBar1 As DevExpress.XtraBars.Navigation.TileBar
-    Friend WithEvents TileBarGroup2 As DevExpress.XtraBars.Navigation.TileBarGroup
-    Friend WithEvents TileBarItem1 As DevExpress.XtraBars.Navigation.TileBarItem
-    Friend WithEvents TileBarItem2 As DevExpress.XtraBars.Navigation.TileBarItem
-    Friend WithEvents TileBarGroup3 As DevExpress.XtraBars.Navigation.TileBarGroup
-    Friend WithEvents TileBarItem3 As DevExpress.XtraBars.Navigation.TileBarItem
-    Friend WithEvents NavigationPane1 As DevExpress.XtraBars.Navigation.NavigationPane
-    Friend WithEvents NavigationPage1 As DevExpress.XtraBars.Navigation.NavigationPage
-    Friend WithEvents NavigationPage2 As DevExpress.XtraBars.Navigation.NavigationPage
-    Friend WithEvents RadialMenu1 As DevExpress.XtraBars.Ribbon.RadialMenu
-    Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents BarManager1 As DevExpress.XtraBars.BarManager
-    Friend WithEvents barDockControlTop As DevExpress.XtraBars.BarDockControl
-    Friend WithEvents barDockControlBottom As DevExpress.XtraBars.BarDockControl
-    Friend WithEvents barDockControlLeft As DevExpress.XtraBars.BarDockControl
-    Friend WithEvents barDockControlRight As DevExpress.XtraBars.BarDockControl
-End Class

app/TaskFlow/frmDashboard1.resx

@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="RadialMenu1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="BarManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>140, 17</value>
-  </metadata>
-</root>

app/TaskFlow/frmDashboard1.vb

@@ -1,3 +0,0 @@
-Public Class frmDashboard1
-
-End Class

app/TaskFlow/frmMain.vb

@@ -2478,10 +2478,6 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
         oStopWatch.Done()
     End Sub
     Private Async Sub frmMain_Shown(sender As Object, e As EventArgs) Handles Me.Shown
-        If USER_USERNAME = "SchreiberM" Then
-            frmDashboard1.Show()
-        End If ' 
-
         If RIBBON_COLOR_SCHEME <> "" Then
             Me.LookAndFeel.UseDefaultLookAndFeel = False
             If RIBBON_COLOR_SCHEME = "Blue".ToUpper Then

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

app/TaskFlow/frmValidator.Designer.vb

@@ -90,7 +90,6 @@ Partial Class frmValidator
         Me.barbtnitmExport = New DevExpress.XtraBars.BarButtonItem()
         Me.ToggleSwitchItemLoadonClick = New DevExpress.XtraBars.BarToggleSwitchItem()
         Me.Attmnt_bbtnitm_LoadonClick = New DevExpress.XtraBars.BarCheckItem()
-        Me.BarButtonItem6 = New DevExpress.XtraBars.BarButtonItem()
         Me.bbtnitmInfoWorkflow = New DevExpress.XtraBars.BarButtonItem()
         Me.bchkitmNotes = New DevExpress.XtraBars.BarCheckItem()
         Me.BarButtonGroup1 = New DevExpress.XtraBars.BarButtonGroup()
@@ -515,7 +514,7 @@ Partial Class frmValidator
         'RibbonControl1
         '
         Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bsiError, Me.bsiInformation, Me.bsiDocID, Me.BarButtonItemFileView, Me.BarButtonItem3, Me.BarButtonItem4, Me.bbtniRefresh, Me.bbtniRefreshSearches, Me.bbtniNext, Me.bbtniDelete, Me.bbtniAnnotation, Me.bsiInfo1, Me.bsiInfo2, Me.BbtnitmSave, Me.BarButtonItem5, Me.Attmt_bbtnitmShow, Me.barbtnitmExport, Me.ToggleSwitchItemLoadonClick, Me.Attmnt_bbtnitm_LoadonClick, Me.BarButtonItem6, Me.bbtnitmInfoWorkflow, Me.bchkitmNotes, Me.BarButtonGroup1})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bsiError, Me.bsiInformation, Me.bsiDocID, Me.BarButtonItemFileView, Me.BarButtonItem3, Me.BarButtonItem4, Me.bbtniRefresh, Me.bbtniRefreshSearches, Me.bbtniNext, Me.bbtniDelete, Me.bbtniAnnotation, Me.bsiInfo1, Me.bsiInfo2, Me.BbtnitmSave, Me.BarButtonItem5, Me.Attmt_bbtnitmShow, Me.barbtnitmExport, Me.ToggleSwitchItemLoadonClick, Me.Attmnt_bbtnitm_LoadonClick, Me.bbtnitmInfoWorkflow, Me.bchkitmNotes, Me.BarButtonGroup1})
         resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
         Me.RibbonControl1.MaxItemId = 38
         Me.RibbonControl1.Name = "RibbonControl1"
@@ -692,16 +691,6 @@ Partial Class frmValidator
         Me.Attmnt_bbtnitm_LoadonClick.ItemInMenuAppearance.Pressed.Options.UseForeColor = True
         Me.Attmnt_bbtnitm_LoadonClick.Name = "Attmnt_bbtnitm_LoadonClick"
         '
-        'BarButtonItem6
-        '
-        resources.ApplyResources(Me.BarButtonItem6, "BarButtonItem6")
-        Me.BarButtonItem6.Id = 32
-        Me.BarButtonItem6.ImageOptions.Image = CType(resources.GetObject("BarButtonItem6.ImageOptions.Image"), System.Drawing.Image)
-        Me.BarButtonItem6.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem6.ImageOptions.LargeImage"), System.Drawing.Image)
-        Me.BarButtonItem6.Name = "BarButtonItem6"
-        Me.BarButtonItem6.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large
-        Me.BarButtonItem6.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
-        '
         'bbtnitmInfoWorkflow
         '
         resources.ApplyResources(Me.bbtnitmInfoWorkflow, "bbtnitmInfoWorkflow")
@@ -746,10 +735,10 @@ Partial Class frmValidator
         '
         'RbnPgGrpActions
         '
+        Me.RbnPgGrpActions.AllowTextClipping = False
         Me.RbnPgGrpActions.ItemLinks.Add(Me.bbtniNext)
         Me.RbnPgGrpActions.ItemLinks.Add(Me.bbtniDelete)
         Me.RbnPgGrpActions.ItemLinks.Add(Me.bbtniAnnotation)
-        Me.RbnPgGrpActions.ItemLinks.Add(Me.BarButtonItem6)
         Me.RbnPgGrpActions.Name = "RbnPgGrpActions"
         resources.ApplyResources(Me.RbnPgGrpActions, "RbnPgGrpActions")
         Me.RbnPgGrpActions.Visible = False
@@ -939,7 +928,6 @@ Partial Class frmValidator
     Friend WithEvents FolderBrowserDialog1 As FolderBrowserDialog
     Friend WithEvents ToggleSwitchItemLoadonClick As DevExpress.XtraBars.BarToggleSwitchItem
     Friend WithEvents Attmnt_bbtnitm_LoadonClick As DevExpress.XtraBars.BarCheckItem
-    Friend WithEvents BarButtonItem6 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents pnlMain As DevExpress.XtraEditors.PanelControl
     Friend WithEvents btnSave As DevExpress.XtraEditors.SimpleButton
     Friend WithEvents DESCRIPTIONLabel As DevExpress.XtraEditors.LabelControl

app/TaskFlow/frmValidator.resx

@@ -619,7 +619,7 @@
     <value>DocumentViewer1</value>
   </data>
   <data name="&gt;&gt;DocumentViewer1.Type" xml:space="preserve">
-    <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.0.2.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.1.0.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;DocumentViewer1.Parent" xml:space="preserve">
     <value>SplitContainer1.Panel2</value>
@@ -1179,38 +1179,6 @@
   <data name="Attmnt_bbtnitm_LoadonClick.ItemInMenuAppearance.Pressed.Font" type="System.Drawing.Font, System.Drawing">
     <value>Tahoma, 8.25pt, style=Bold</value>
   </data>
-  <data name="BarButtonItem6.Caption" xml:space="preserve">
-    <value>Beleg anzeigen</value>
-  </data>
-  <data name="BarButtonItem6.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAFNob3c7RXllO0njByUAAAExSURB
-        VDhPpZKxSsRQFET3Nyy18wOExcYv8G/0B+TAgkXKgAhmyzQWgsViY7FFZItsFFJobyMuWggLJuHKPHzh
-        mSgavDBwM3dmktz3RmY2+g96xFD0CGAXOI3j2CaTiQPwIE6zrj40bgJX0+nUlsulrVYrq+vaQb04zaSR
-        9ksAsAe8ZFlmqrd1Zdd3j3Z4duOew5JGWnlcALANvJZl2ZqPz29t/2jm8F1JK4+8CpgtFot2qDd7808B
-        KnnkVcC6qqp2oM/+S4A88v4aECLcSRhw4Zen6v5CCM18AQfyKmALeC6Kwg26S/QQp5lKWnnk9ce4E0WR
-        zefzNsQfo6Dem6UBnuTpXqSNNE0tSRLL89xdnqZpHNSLAzLgUtreTQyCxsAJcA+8f0K9uHFX3wsYih4x
-        FB8q0AjdQAvTBwAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="BarButtonItem6.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAFNob3c7RXllO0njByUAAAJSSURB
-        VFhHxZY9i1NBFIZ3/RNbbG1nJf4Nuy232dY/IcpavRYLW22ZEAvLEEIkkJRiYZYQi7QmYiCYRTTICgmO
-        PNe5YXJmbj4WvR544XLmnPc8k/sxOXDOHfxPRYmyFSXKVpQoW1GibEWJshUlNknSI0kvJHUkfZb004tr
-        cqxRQ20k67cTgKR7kk4lfZDkdhS19NB7dwBJDyT1cuNqteq63a4bjUZuPp+7xWKRiWtyrFETgNCLx/4A
-        kp5IusWoVqu5fr/vdg1q6fEQeOAVzUgCSDrUn8gMWq3WmvmXb7eu/u6je/rqvTt92V1bs0Fv8GsQh3Ze
-        CuAibxoOh2uGw09f3fnra/f4+ZuVtgUeAcSFnWeHn+XFk8lkzYid2+G7ABB4BRBnSQBJx5J+UDQYDKxH
-        9rPb4bsCEHh6AGYcpwCuKGg0GrY3C+65Hb4PAIG3h7hKAdywOJvNbF8WPHB2+L4AeHuAmxTAjMXpdGr7
-        sigCSKno7cDbA7DLCOCSxXq9bvuyKLoFKVGbCrw9wGUK4EjSdwra7bbtLXwIU6LWBp5+ODOOIgAPcSLp
-        F4Xj8XjNoOg1tKKG2jDw8sPxPglnrgF4iPP8nbWf39SHyA6nJgw8cj+87bwIwEI0m023XC5XhvZTjLgm
-        F+6cHno3DS8E8BAcp9kzUalUXK/XW5lvC2rpCe45XtGMjQAe4r6kt/kuMO10OoXHMWvBYEQvHvsfxwEE
-        pyMP53VgvE3U0kNvNvzOAAbmoaRnG/6SsUbNauhfBfgXihJlK0qUrShRtqJE2YoSZes3UL0KST/PhM0A
-        AAAASUVORK5CYII=
-</value>
-  </data>
   <data name="bbtnitmInfoWorkflow.Caption" xml:space="preserve">
     <value>Anzeigen</value>
   </data>
@@ -1861,12 +1829,6 @@
   <data name="&gt;&gt;Attmnt_bbtnitm_LoadonClick.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.BarCheckItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;BarButtonItem6.Name" xml:space="preserve">
-    <value>BarButtonItem6</value>
-  </data>
-  <data name="&gt;&gt;BarButtonItem6.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="&gt;&gt;bbtnitmInfoWorkflow.Name" xml:space="preserve">
     <value>bbtnitmInfoWorkflow</value>
   </data>

app/TaskFlow/frmValidator.vb

@@ -105,7 +105,7 @@ Public Class frmValidator
     Private ControlCreator As ClassControlCreator
     Private PerformanceLogger As Logger
     Private Validator As Validator
-    Private Const LOG_PERF = True
+    Private Const LOG_PERF = False
     Private ReadOnly MyValidationLogger As Logger
 
     Private Property OperationMode As OperationMode
@@ -398,7 +398,7 @@ Public Class frmValidator
                         If oProfileRejectionText <> String.Empty And oProfile_REJECT_SQL_REASONS <> String.Empty Then
                             functBtnReject = True
                         End If
-                        If oProfileNotResponsibleText <> String.Empty And oProfile_NOT_RESP_SQL <> String.Empty Then
+                        If (oProfileNotResponsibleQuestion <> String.Empty Or oProfileNotResponsibleText <> String.Empty) And oProfile_NOT_RESP_SQL <> String.Empty Then
                             If IDB_ACTIVE = True Then
                                 functBtnNR = True
                             End If
@@ -452,11 +452,9 @@ Public Class frmValidator
                             End If
                         End If
 
-                        bbtniNext.Visibility = BarItemVisibility.Always
 
+                        bbtniNext.Visibility = BarItemVisibility.Never
                         If CURRENT_JUMP_DOC_GUID <> 0 Then
-                            bbtniNext.Visibility = BarItemVisibility.Never
-
                             Amount_Docs2Validate = 1
                         Else
 
@@ -2290,8 +2288,8 @@ Public Class frmValidator
     '        Logger.Error(ex)
     '    End Try
     'End Sub
-    Private Sub Controls2B_EnDisabled_on_Load()
+    Private Sub Controls2B_EnDisabled()
-        If LOG_PERF Then PerformanceLogger.Info("Controls2B_EnDisabled_on_Load")
+        If LOG_PERF Then PerformanceLogger.Info("Controls2B_EnDisabled")
 
         Try
             Dim oFilteredDatatable As DataTable = DT_CONTROLS.Clone()
@@ -2318,8 +2316,10 @@ Public Class frmValidator
 
                         Try
                             MyValidationLogger.Debug($"Result of Enable SQL [{oResult}]...")
-                            oControl.Enabled = oResult
+
+                            oControl.Enabled = CBool(oResult)
                         Catch ex As Exception
+                            MyValidationLogger.Warn($"Could not convert value [oResult] to Boolean!")
                             MyValidationLogger.Warn($"Error en/disabling control onLoad: [{ex.Message}]")
                         End Try
 
@@ -2482,7 +2482,7 @@ Public Class frmValidator
                 End Try
 
                 Try
-                    Amount_Docs2Validate = oDT.Rows(0).Item(2)
+                    Amount_Docs2Validate = CInt(oDT.Rows(0).Item(2))
                     MyValidationLogger.Debug($"Get_Next_GUID: Amount_Docs2Validate [{Amount_Docs2Validate}]...")
                 Catch ex As Exception
                     Amount_Docs2Validate = 0
@@ -2560,25 +2560,23 @@ Public Class frmValidator
 
             WMDocPathWindows = String.Empty
             If OPERATION_MODE_FS <> ClassConstants.OpModeFS_ZF Then
+                Dim oSQL = $"SELECT dbo.FNPM_GET_FILEPATH ({CURRENT_DOC_GUID},{_CheckStandard})"
+                oResult = DatabaseFallback.GetScalarValueECM(oSQL)
+                MyValidationLogger.Debug($"First Checking file [{oResult}] exists?...")
                 If File.Exists(oResult) = False Then
-                    Dim oSQL = $"SELECT dbo.FNPM_GET_FILEPATH ({CURRENT_DOC_GUID},{_CheckStandard})"
+                    MyValidationLogger.Info($"Getting filepath with standard 1 ...")
-                    oResult = DatabaseFallback.GetScalarValueECM(oSQL)
-                    MyValidationLogger.Debug($"Checking file 0 [{oResult}] exists?...")
-                    DocPathWindows = oResult
-                    MyValidationLogger.Info($"GetWMDocPathWindows returned false [{oResult}] - trying with standard again...")
                     oSQL = $"SELECT [dbo].[FNPM_GET_FILEPATH] ({CURRENT_DOC_GUID},1)"
-
                     oResult = DatabaseFallback.GetScalarValueECM(oSQL)
-
+                    MyValidationLogger.Debug($"Second Checking file [{oResult}] exists?...")
-                    MyValidationLogger.Debug($"Checking file 1[{oResult}] exists?...")
                     If File.Exists(oResult) = False Then
-                        MyValidationLogger.Info($"GetWMDocPathWindows FileExists2 also returned false [{oResult}]!")
+                        MyValidationLogger.Info($"Second FileExists also returned false [{oResult}]!")
                         DocPathWindows = oResult
                         MyValidationLogger.Warn($"GetDocPathWindows: File [{oResult}] not existing!")
                         Return False
                     End If
-
                 End If
+                DocPathWindows = oResult
+
             Else
                 oResult = ClassConstants.OpModeFS_ZF
                 MyValidationLogger.Debug($"GetDocPathWindows: Filestore is {ClassConstants.OpModeFS_ZF}")
@@ -2677,14 +2675,22 @@ Public Class frmValidator
                 DatabaseFallback.ExecuteNonQueryECM(sql)
 
                 ' ############ Infos eintragen #################
-                ' txtDateipfad.Text = Document_Path
-                'Dim omsg = $"{ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("remainingOps")}: {Amount_Docs2Validate}"
-                Dim omsg = String.Format(S.Verbleibende_Vorgänge___0_, Amount_Docs2Validate)
 
-                If Amount_Docs2Validate > 0 Then
+                If Amount_Docs2Validate >= 1 Then
+                    Dim omsg = String.Format(S.Verbleibende_Vorgänge___0_, Amount_Docs2Validate)
                     bsiInformation.Caption = omsg
+
+                    bsiInformation.Caption = omsg
+                    If RbnPgGrpActions.Visible = False Then
+                        RbnPgGrpActions.Visible = True
+                    End If
+                    bbtniNext.Visibility = BarItemVisibility.Always
                 Else
-                    bsiInformation.Caption = "Could not get the amount of remaining docs!"
+                    bbtniNext.Visibility = BarItemVisibility.Never
+                    If bbtniDelete.Visibility = BarItemVisibility.Never And bbtniAnnotation.Visibility = BarItemVisibility.Never Then
+                        RbnPgGrpActions.Visible = False
+                    End If
+                    bsiInformation.Caption = ""
                 End If
 
                 bsiDocID.Caption = "Document-ID: " & CURRENT_DOC_ID & " - GUID: " & CURRENT_DOC_GUID
@@ -2831,7 +2837,7 @@ Public Class frmValidator
             Catch ex As Exception
                 MyValidationLogger.Error(ex)
             End Try
-
+            Controls2B_EnDisabled()
 
             MyValidationLogger.Debug("frmValidator: LoadNextDocument finished!")
         Catch ex As Exception
@@ -2898,13 +2904,13 @@ Public Class frmValidator
             End If
             SplitContainer1.Panel2Collapsed = True
             If Not IsNothing(DocumentViewer1) Then
-                    DocumentViewer1.Visible = False
+                DocumentViewer1.Visible = False
-                End If
+            End If
 
-                RibbonPageFile.Visible = False
+            RibbonPageFile.Visible = False
-                Exit Sub
+            Exit Sub
-            Else
+        Else
-                If Not IsNothing(DocumentViewer1) Then
+            If Not IsNothing(DocumentViewer1) Then
                 DocumentViewer1.Visible = True
             End If
 
@@ -3375,7 +3381,6 @@ Public Class frmValidator
                                             MyValidationLogger.Warn($"Unexpected error in Set Backcolor [{oControl.Name}]: {ex.Message}")
                                             MyValidationLogger.Error(ex)
                                         End Try
-
                                         ControlCreator.GridTables_HandleControlValueChange(PanelValidatorControl, DT_COLUMNS_GRID_WITH_SQL_WITH_CTRL_PLACEHOLDER)
 
                                     Catch ex As Exception
@@ -4012,7 +4017,6 @@ Public Class frmValidator
         '  Refresh_FileList()
         Load_Next_Document(True)
 
-        Controls2B_EnDisabled_on_Load()
         _DependingControl_In_Action = False
         _DependingColumn_In_Action = False
 
@@ -4228,7 +4232,7 @@ Public Class frmValidator
     End Function
     Sub Finish_WFStep(Optional includeFI As Boolean = True)
         btnSave.Enabled = False
-        MyValidationLogger.Debug("Abschluss für Dok: " & CURRENT_DOC_PATH & " gestartet")
+        MyValidationLogger.Debug("Abschluss für DocID " & CURRENT_DOC_ID & " wird gestartet ...")
         _ItemWorked = True
         Dim oErrorOcurred As Boolean = False
         If OverrideAll = False Then
@@ -4500,35 +4504,38 @@ Public Class frmValidator
                         DatabaseFallback.ExecuteNonQueryECM(ins)
                         Dim oFIsql As String
                         'Close_document_viewer()
-                        If Current_Document.Extension = "pdf" Then
+                        If Not IsNothing(Current_Document) Then
-                            If Not IsNothing(WORK_HISTORY_ENTRY) Then
+                            If Current_Document.Extension = "pdf" Then
-                                If CBool(CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_WORK_HISTORY_ENTRY")) = True Then
+                                If Not IsNothing(WORK_HISTORY_ENTRY) Then
-                                    oFIsql = String.Format("SELECT * FROM TBPM_FILES_WORK_HISTORY WHERE GUID = (SELECT MAX(GUID) FROM TBPM_FILES_WORK_HISTORY WHERE PROFIL_ID = {0} AND DOC_ID = {1})", CURRENT_ProfilGUID, CURRENT_DOC_ID)
+                                    If CBool(CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_WORK_HISTORY_ENTRY")) = True Then
-                                    Dim DT_ENTRY As DataTable = DatabaseFallback.GetDatatableECM(oFIsql) ', "Finish_WFStep2")
+                                        oFIsql = String.Format("SELECT * FROM TBPM_FILES_WORK_HISTORY WHERE GUID = (SELECT MAX(GUID) FROM TBPM_FILES_WORK_HISTORY WHERE PROFIL_ID = {0} AND DOC_ID = {1})", CURRENT_ProfilGUID, CURRENT_DOC_ID)
-                                    If Not IsNothing(DT_ENTRY) Then
+                                        Dim DT_ENTRY As DataTable = DatabaseFallback.GetDatatableECM(oFIsql) ', "Finish_WFStep2")
-                                        If DT_ENTRY.Rows.Count = 1 Then
+                                        If Not IsNothing(DT_ENTRY) Then
-                                            Dim AnnotationString = DT_ENTRY.Rows(0).Item("WORKED_WHEN") & " " & DT_ENTRY.Rows(0).Item("WORKED_BY") & ": " & DT_ENTRY.Rows(0).Item("STATUS_COMMENT")
+                                            If DT_ENTRY.Rows.Count = 1 Then
-                                            ClassAnnotation.Annotate_PDF("Workflow-State:", AnnotationString, 0, False)
+                                                Dim AnnotationString = DT_ENTRY.Rows(0).Item("WORKED_WHEN") & " " & DT_ENTRY.Rows(0).Item("WORKED_BY") & ": " & DT_ENTRY.Rows(0).Item("STATUS_COMMENT")
+                                                ClassAnnotation.Annotate_PDF("Workflow-State:", AnnotationString, 0, False)
+                                            End If
                                         End If
                                     End If
-                                End If
+                                    Dim oAnnotateAllWHEs = CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_ALL_WORK_HISTORY_ENTRIES")
-                                Dim oAnnotateAllWHEs = CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_ALL_WORK_HISTORY_ENTRIES")
+                                    If CBool(oAnnotateAllWHEs) = True Then
-                                If CBool(oAnnotateAllWHEs) = True Then
+                                        oFIsql = String.Format("SELECT * FROM TBPM_FILES_WORK_HISTORY WHERE DOC_ID = {1} ORDER BY GUID", CURRENT_ProfilGUID, CURRENT_DOC_ID)
-                                    oFIsql = String.Format("SELECT * FROM TBPM_FILES_WORK_HISTORY WHERE DOC_ID = {1} ORDER BY GUID", CURRENT_ProfilGUID, CURRENT_DOC_ID)
+                                        Dim DT_ENTRIES As DataTable = DatabaseFallback.GetDatatableECM(oFIsql) ', "Finish_WFStep3")
-                                    Dim DT_ENTRIES As DataTable = DatabaseFallback.GetDatatableECM(oFIsql) ', "Finish_WFStep3")
+                                        If Not IsNothing(DT_ENTRIES) Then
-                                    If Not IsNothing(DT_ENTRIES) Then
+                                            If DT_ENTRIES.Rows.Count > 0 Then
-                                        If DT_ENTRIES.Rows.Count > 0 Then
+                                                Dim AnnotationString As String = ""
-                                            Dim AnnotationString As String = ""
+                                                For Each rw As DataRow In DT_ENTRIES.Rows
-                                            For Each rw As DataRow In DT_ENTRIES.Rows
+                                                    AnnotationString = AnnotationString & rw.Item("WORKED_WHEN") & " " & rw.Item("WORKED_BY") & ": " & rw.Item("STATUS_COMMENT") & vbNewLine
-                                                AnnotationString = AnnotationString & rw.Item("WORKED_WHEN") & " " & rw.Item("WORKED_BY") & ": " & rw.Item("STATUS_COMMENT") & vbNewLine
+                                                Next
-                                            Next
+                                                ClassAnnotation.Annotate_PDF("Workflow History:", AnnotationString, 0, False, 10, 40)
-                                            ClassAnnotation.Annotate_PDF("Workflow History:", AnnotationString, 0, False, 10, 40)
+                                            End If
                                         End If
                                     End If
                                 End If
                             End If
                         End If
 
+
                         'wenn Move2Folder aktiviert wurde
                         If Move2Folder <> "" And (OPERATION_MODE_FS = ClassConstants.OpModeFS_PWM Or OPERATION_MODE_FS = ClassConstants.OpModeFS_IDBWM) Then
                             idxerr_message = allgFunk.Move2Folder(WMDocPathWindows, Move2Folder, CURRENT_ProfilGUID, WINDREAM_ALLG)
@@ -5949,8 +5956,14 @@ Public Class frmValidator
     Sub SetStatusLabel(infotext As String, Optional pColor As String = "")
         bsiInformation.Caption = infotext & " " & Now.ToString
         If pColor <> String.Empty Then
-            bsiInformation.ItemAppearance.Normal.BackColor = Color.FromName(pColor)
+            Try
-            bsiInformation.ItemAppearance.Normal.ForeColor = GraphicsEx.GetContrastedColor(Color.FromName(pColor))
+                bsiInformation.ItemAppearance.Normal.BackColor = Color.FromName(pColor)
+                bsiInformation.ItemAppearance.Normal.ForeColor = GraphicsEx.GetContrastedColor(Color.FromName(pColor))
+            Catch ex As Exception
+                bsiInformation.ItemAppearance.Normal.BackColor = Color.Transparent
+                bsiInformation.ItemAppearance.Normal.ForeColor = Color.Black
+            End Try
+
         Else
             bsiInformation.ItemAppearance.Normal.BackColor = Color.Transparent
             bsiInformation.ItemAppearance.Normal.ForeColor = Color.Black
@@ -6250,8 +6263,7 @@ Public Class frmValidator
             End If
         Next
 
-
+        Override_SQLCommand = clsPatterns.ReplaceAllValues(oProfile_NOT_RESP_SQL, PanelValidatorControl, True)
-        oProfile_NOT_RESP_SQL = clsPatterns.ReplaceAllValues(oProfile_NOT_RESP_SQL, PanelValidatorControl, True)
         Dim oCaption As String = "Bestätigung - "
         If USER_LANGUAGE <> "de-DE" Then
             oCaption = "Confirmation - "
@@ -6285,7 +6297,6 @@ Public Class frmValidator
             End If
 
             OverrideAll = True
-            Override_SQLCommand = oProfile_NOT_RESP_SQL
             Override = True
             Finish_WFStep()
         End If