MS Update

app/DD-Record-Organizer/App.config

@@ -9,12 +9,10 @@
         </sectionGroup>
     </configSections>
     <connectionStrings>
-        <add name="DD_Record_Organizer.My.MySettings.DD_DMSConnectionString"
+        <add name="DD_Record_Organizer.My.MySettings.DD_DMSConnectionString" connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=ddd" providerName="System.Data.SqlClient"/>
-            connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=ddd"
-            providerName="System.Data.SqlClient" />
     </connectionStrings>
     <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
     </startup>
     <userSettings>
         <DD_Record_Organizer.My.MySettings>
@@ -25,19 +23,19 @@
                 <value>*.*</value>
             </setting>
             <setting name="WD_ENTITYIMP_IMPPATH" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="WD_ENTITYIMP_TARGETPATH" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="WD_ENTITYIMP_SAFETYPATH" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="WD_ENTITYIMP_OBJECTTYPE" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="WD_INDEXDOKART_SAVE" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="User_Calendar_isChild" serializeAs="String">
                 <value>True</value>
@@ -52,17 +50,20 @@
                 <value>False</value>
             </setting>
             <setting name="TBPMO_RIGHT_GROUPDataGridView" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="frmRecordViewSplitter" serializeAs="String">
                 <value>332</value>
             </setting>
             <setting name="TBPMO_RIGHT_USERDataGridView" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="UserDocIDIndexname" serializeAs="String">
                 <value>Dokument-ID</value>
             </setting>
+            <setting name="SaveDocGridlayout" serializeAs="String">
+                <value>False</value>
+            </setting>
         </DD_Record_Organizer.My.MySettings>
     </userSettings>
     <applicationSettings>

app/DD-Record-Organizer/ClassBackgroundHelper.vb

@@ -79,7 +79,7 @@ Public Class ClassBackgroundHelper
             End Using
             _grid.GridControl.BackgroundImage = _processedImage
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in GenerateBackgroundImage: " & ex.Message)
+            LOGGER.Warn("Unexpected Error in GenerateBackgroundImage: " & ex.Message)
         End Try
        
     End Sub
@@ -125,7 +125,7 @@ Public Class ClassBackgroundHelper
             End Select
             Return location
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in CalculateImageLocation: " & ex.Message)
+            LOGGER.Warn("Unexpected Error in CalculateImageLocation: " & ex.Message)
             Return Nothing
         End Try
         

app/DD-Record-Organizer/ClassConstructors.vb

@@ -59,7 +59,7 @@
             Next
             Return False
         Catch ex As Exception
-            ClassLogger.Add("Error in Check_TreeViewLoaded: " & ex.Message, True)
+            LOGGER.Warn("Error in Check_TreeViewLoaded: " & ex.Message)
             Return False
         End Try
     End Function

app/DD-Record-Organizer/ClassControlBuilder.vb

@@ -256,7 +256,7 @@ Public Class ClassControlBuilder
             Dim combo As CustomComboBox = sender
             combo.BackColor = Color.LemonChiffon
         Catch ex As Exception
-            ClassLogger.Add("Unexpected error in OnComboBoxFocus: " & ex.Message, True)
+            LOGGER.Warn("Unexpected error in OnComboBoxFocus: " & ex.Message)
         End Try
 
     End Sub
@@ -265,7 +265,7 @@ Public Class ClassControlBuilder
             Dim combo As CustomComboBox = sender
             combo.BackColor = Color.White
         Catch ex As Exception
-            ClassLogger.Add("Unexpected error in OnComboBoxLostFocus: " & ex.Message, True)
+            LOGGER.Warn("Unexpected error in OnComboBoxLostFocus: " & ex.Message)
         End Try
 
     End Sub
@@ -282,16 +282,16 @@ Public Class ClassControlBuilder
             End If
             For Each row As DataRow In TableResult.Rows
                 Dim sqlcommand As String = row.Item("SQL_COMMAND_2")
-                Dim msg = String.Format(" >> Working on enabling control {0} - SQL: {1}", CONTROL_ID.ToString, sqlcommand)
+                Dim msg = String.Format("Working on enabling control {0} - SQL: {1}", CONTROL_ID.ToString, sqlcommand)
-                If LogErrorsOnly = False Then ClassLogger.Add(msg, False)
+                LOGGER.Debug(msg, False)
                 If IsNothing(sqlcommand) Then
                     Continue For
                 End If
 
                 ' Versuchen, die RecordId zu ersetzen, falls eine existiert
                 sqlcommand = sqlcommand.ToUpper.Replace("@RECORD_ID", CURRENT_RECORD_ID)
-                msg = String.Format(" >> sqlcommand-replaced1: {0}", sqlcommand)
+                msg = String.Format("sqlcommand-replaced1: {0}", sqlcommand)
-                If LogErrorsOnly = False Then ClassLogger.Add(msg, False)
+                LOGGER.Debug(msg, False)
                 ' ControlId Platzhalter suchen und ersetzen
                 Dim regex As New System.Text.RegularExpressions.Regex("(@(\d+)@)")
                 Dim match As System.Text.RegularExpressions.Match = regex.Match(sqlcommand)
@@ -306,7 +306,7 @@ Public Class ClassControlBuilder
                                                                                                 End Function).SingleOrDefault()
                     ' Wir ersetzen den platzhalter im sql command mit dem übergebenen wert
                     sqlcommand = sqlcommand.Replace(match.Groups(1).Value, value)
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> " & String.Format("Executing SQL_COMMAND: {0} for controlID {1}", sqlcommand, dependingControlId), False)
+                    LOGGER.Debug("" & String.Format("Executing SQL_COMMAND: {0} for controlID {1}", sqlcommand, dependingControlId), False)
 
                     ' Jetzt wird das SQL Command ausgeführt, es MUSS einen Boolschen Wert zurückgeben, True, False, 0, 1
                     Dim dt_result As DataTable = Nothing
@@ -318,20 +318,20 @@ Public Class ClassControlBuilder
                         Try
                             enabled = CBool(dt_result.Rows(0).Item(0))
                         Catch ex As Exception
-                            msg = String.Format(">> Could not convert value of tablecontent to boolean!! SQL {0} # tablecontent: {1}" & vbNewLine, sqlcommand, dependingControlId)
+                            msg = String.Format("Could not convert value of tablecontent to boolean!! SQL {0} # tablecontent: {1}" & vbNewLine, sqlcommand, dependingControlId)
-                            ClassLogger.Add(msg)
+                            LOGGER.Warn(msg)
                         End Try
 
                         If enabled = False Then
-                            msg = String.Format(" >> Control {0} will be disabled." & vbNewLine, dependingControlId.ToString)
+                            msg = String.Format("Control {0} will be disabled." & vbNewLine, dependingControlId.ToString)
-                            If LogErrorsOnly = False Then ClassLogger.Add(msg, False)
+                            LOGGER.Debug(msg, False)
                         Else
-                            msg = String.Format(" >> Control {0} will be enabled." & vbNewLine, dependingControlId.ToString)
+                            msg = String.Format("Control {0} will be enabled." & vbNewLine, dependingControlId.ToString)
-                            If LogErrorsOnly = False Then ClassLogger.Add(msg, False)
+                            LOGGER.Debug(msg, False)
                         End If
                         dependingControl.Enabled = enabled
                     Else
-                        ClassLogger.Add(" >> Attention: RowCount for enabling control (" & dependingControlId.ToString & ") was '" & dt_result.Rows.Count.ToString & "' and not 1 as expected - Check SQL: '" & sqlcommand & "'", False)
+                        LOGGER.Warn("Attention: RowCount for enabling control (" & dependingControlId.ToString & ") was '" & dt_result.Rows.Count.ToString & "' and not 1 as expected - Check SQL: '" & sqlcommand & "'", False)
                     End If
 
                 End If
@@ -381,7 +381,7 @@ Public Class ClassControlBuilder
 
 
             End If
-            If LogErrorsOnly = False Then ClassLogger.Add(" >> DependingControls -  For Each row As DataRow In TableResult.Rows", False, False)
+            LOGGER.Debug("DependingControls -  For Each row As DataRow In TableResult.Rows", False, False)
             For Each row As DataRow In TableResult.Rows
                 Dim sqlcommand As String = row.Item("SQL_COMMAND_1")
 
@@ -402,15 +402,15 @@ Public Class ClassControlBuilder
                         If Not IsNothing(ctrlvalID) Then
 
                             If ClassControlCommandsUI.UpdateControlValue(CONTROL_ID, CURRENT_RECORD_ID, value.ToString, CURRENT_ENTITY_ID) = False Then
-                                ClassLogger.Add(String.Format(" >> ClassControlCommandsUI.UpdateControlValue (1) was not successfull - ControlID: {0},RecordID: {1},value: {2}'", CONTROL_ID, CURRENT_RECORD_ID, value), False)
+                                LOGGER.Warn(String.Format("ClassControlCommandsUI.UpdateControlValue (1) was not successfull - ControlID: {0},RecordID: {1},value: {2}'", CONTROL_ID, CURRENT_RECORD_ID, value), False)
                             Else
                                 ControlsChanged.Remove(CONTROL_ID)
                             End If
                         Else
-                            If LogErrorsOnly = False Then ClassLogger.Add(" >> ctrlvalID is Nothing - Attention.....", False, False)
+                            LOGGER.Debug("ctrlvalID is Nothing - Attention.....", False, False)
                             If CURRENT_RECORD_ID <> 0 Then
                                 If ClassControlCommandsUI.CreateControlProcedure(CONTROL_ID, CURRENT_RECORD_ID, value, CURRENT_ENTITY_ID) = 0 Then
-                                    ClassLogger.Add(String.Format(" >> ClassControlCommandsUI.CreateControlProcedure (1) was not successfull - ControlID: {0},RecordID: {1},value: {2}'", CONTROL_ID, CURRENT_RECORD_ID, value), False)
+                                    LOGGER.Warn(String.Format("ClassControlCommandsUI.CreateControlProcedure (1) was not successfull - ControlID: {0},RecordID: {1},value: {2}'", CONTROL_ID, CURRENT_RECORD_ID, value), False)
                                 Else
                                     ControlsChanged.Remove(CONTROL_ID)
                                 End If
@@ -421,7 +421,7 @@ Public Class ClassControlBuilder
                     ' DependingControlId bezeichnet das Control, das die Abhängigkeit enthält
                     Dim dependingControlId As Integer = row.Item("GUID")
                     If dependingControlId > 0 Then
-                        If LogErrorsOnly = False Then ClassLogger.Add(">> dependingControlId: " + dependingControlId.ToString, False, False)
+                        LOGGER.Debug("dependingControlId: " + dependingControlId.ToString, False, False)
                     End If
                     Dim panel As Panel = Me.MasterPanel
                     'Dim panel As Panel = DirectCast(control.Parent, Panel)
@@ -430,12 +430,12 @@ Public Class ClassControlBuilder
                                                                                                     Return DirectCast(c.Tag, ClassControlMetadata).Id = dependingControlId
                                                                                                 End Function).SingleOrDefault()
                     If IsNothing(dependingControl) Then
-                        ClassLogger.Add(">> dependingControl is Nothing - Attention.....", True)
+                        LOGGER.Warn("dependingControl is Nothing - Attention.....")
                         Continue For
                     End If
 
                     sqlcommand = sqlcommand.Replace(match.Groups(1).Value, value)
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> " & String.Format("Executing SQL_COMMAND: '{0}' for controlID '{1}'", sqlcommand, dependingControlId), False)
+                    LOGGER.Debug("" & String.Format("Executing SQL_COMMAND: '{0}' for controlID '{1}'", sqlcommand, dependingControlId), False)
 
                     Dim dt As DataTable = ClassDatabase.Return_Datatable(sqlcommand, True)
                     Dim type = dependingControl.GetType().Name
@@ -450,7 +450,7 @@ Public Class ClassControlBuilder
                                         dateValue = CStr(CDate(val)) 'Format(val, "dd-MM-yyyy"))
                                     Catch ex As Exception
                                         If val <> "" Then
-                                            ClassLogger.Add("Unexpected Error in converting Value '" & value & "' to date - Control-ID: " & dependingControlId.ToString & "- Error: " & ex.Message)
+                                            LOGGER.Warn("Unexpected Error in converting Value '" & value & "' to date - Control-ID: " & dependingControlId.ToString & "- Error: " & ex.Message)
                                         End If
                                         Continue For
                                     End Try
@@ -463,35 +463,35 @@ Public Class ClassControlBuilder
                                         'Dim upd = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}', CHANGED_WHO = '{1}' WHERE GUID = {2}", dateValue, USER_USERNAME, id)
                                         If ClassControlCommandsUI.UpdateControlValue(dependingControlId, CURRENT_RECORD_ID, dateValue, CURRENT_ENTITY_ID) = True Then
                                             ControlsChanged.Remove(dependingControlId)
-                                            If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was not nothing - Updated the ControlValue'", False) '" & upd)
+                                            LOGGER.Debug("Value was not nothing - Updated the ControlValue'", False) '" & upd)
                                         Else
-                                            ClassLogger.Add(" >> Check Update depending control (DateEdit) value as it was nothing and Update was not successful - Update-Command '", False) ' & upd & "'")
+                                            LOGGER.Warn("Check Update depending control (DateEdit) value as it was nothing and Update was not successful - Update-Command '", False) ' & upd & "'")
                                         End If
 
                                     Else
                                         If ClassControlCommandsUI.CreateControlProcedure(dependingControlId, CURRENT_RECORD_ID, dateValue, CURRENT_ENTITY_ID) = 1 Then
                                             ControlsChanged.Remove(dependingControlId)
-                                            If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was nothing - Inserted the ControlValue (DateEdit)!", False)
+                                            LOGGER.Debug("Value was nothing - Inserted the ControlValue (DateEdit)!", False)
                                         Else
-                                            ClassLogger.Add(String.Format(" >> ClassControlCommandsUI.InsertControlValue (DateEdit) was not successfull - ControlID: {0},RecordID: {1},value: {2}'", CONTROL_ID, CURRENT_RECORD_ID, dateValue), False)
+                                            LOGGER.Warn(String.Format("ClassControlCommandsUI.InsertControlValue (DateEdit) was not successfull - ControlID: {0},RecordID: {1},value: {2}'", CONTROL_ID, CURRENT_RECORD_ID, dateValue), False)
 
                                         End If
 
 
                                     End If
                                 Catch ex As Exception
-                                    ClassLogger.Add("Unexpected Error in OnComboBoxValueChanged - TextBox: " & ex.Message, True)
+                                    LOGGER.Warn("Unexpected Error in OnComboBoxValueChanged - TextBox: " & ex.Message)
                                 End Try
                             Else
-                                ClassLogger.Add(" >> Attention: RowCount for depending control was '" & dt.Rows.Count.ToString & "' and not 1 as expected - Check SQL: '" & sqlcommand & "'")
+                                LOGGER.Warn("Attention: RowCount for depending control was '" & dt.Rows.Count.ToString & "' and not 1 as expected - Check SQL: '" & sqlcommand & "'")
                             End If
                         Case "CustomComboBox"
                             ControlLoader.Combobox.SetDataSource(DirectCast(dependingControl, CustomComboBox), dt)
                         Case "CheckedListBoxControl"
-                            If LogErrorsOnly = False Then ClassLogger.Add(" >> DependingControls - CheckedListBoxControl", False, False)
+                            LOGGER.Debug("DependingControls - CheckedListBoxControl", False, False)
                             Dim checkedlistbox = DirectCast(dependingControl, DevExpress.XtraEditors.CheckedListBoxControl)
                             If IsNothing(checkedlistbox) Then
-                                If LogErrorsOnly = False Then ClassLogger.Add(" >> checkedlistbox is Nothing - Attention.....", False, False)
+                                LOGGER.Debug("checkedlistbox is Nothing - Attention.....", False, False)
                             End If
                             ControlLoader.CheckedListBox.SetDataSource(checkedlistbox, dt)
 
@@ -511,7 +511,7 @@ Public Class ClassControlBuilder
                                 Try
                                     ControlLoader.Label.LoadValue(DirectCast(dependingControl, Label), 9999, 9999, dt.Rows(0).Item(0).ToString, True)
                                 Catch ex As Exception
-                                    ClassLogger.Add("Unexpectet Error in OnComboBoxValueChanged - Label: " & ex.Message, True)
+                                    LOGGER.Warn("Unexpectet Error in OnComboBoxValueChanged - Label: " & ex.Message)
                                 End Try
                             End If
                         Case "TextBox"
@@ -524,33 +524,33 @@ Public Class ClassControlBuilder
 
                                     If Not IsNothing(id) Then
                                         If ClassControlCommandsUI.UpdateControlValue(dependingControlId, CURRENT_RECORD_ID, value1, CURRENT_ENTITY_ID) = True Then
-                                            If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was not nothing - Updated the ControlValue'", False) '" & upd)
+                                            LOGGER.Debug("Value was not nothing - Updated the ControlValue'", False) '" & upd)
                                             ControlsChanged.Remove(dependingControlId)
                                         Else
-                                            ClassLogger.Add(String.Format(" >> ClassControlCommandsUI.UpdateControlValue (TextBox) was not successfull - ControlID: {0},RecordID: {1},value: {2}'", CONTROL_ID, CURRENT_RECORD_ID, value1), False)
+                                            LOGGER.Warn(String.Format("ClassControlCommandsUI.UpdateControlValue (TextBox) was not successfull - ControlID: {0},RecordID: {1},value: {2}'", CONTROL_ID, CURRENT_RECORD_ID, value1), False)
                                         End If
                                         'Dim upd = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}', CHANGED_WHO = '{1}' WHERE GUID = {2}", value1, USER_USERNAME, id)
                                         'If ClassDatabase.Execute_non_Query(upd) = True Then
-                                        '    If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was not nothing - Updated the ControlValue '" & upd)
+                                        '    LOGGER.Debug("Value was not nothing - Updated the ControlValue '" & upd)
                                         'Else
-                                        '    ClassLogger.Add(" >> Check Update depending control value as it was nothing and Update was not successful - Update-Command '" & upd & "'")
+                                        '   Logger.Warn("Check Update depending control value as it was nothing and Update was not successful - Update-Command '" & upd & "'")
                                         'End If
 
                                     Else
                                         If ClassControlCommandsUI.CreateControlProcedure(dependingControlId, CURRENT_RECORD_ID, value1, CURRENT_ENTITY_ID) = 1 Then
                                             ControlsChanged.Remove(dependingControlId)
-                                            If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was nothing - Inserted the ControlValue (TextBox)!", False)
+                                            LOGGER.Debug("Value was nothing - Inserted the ControlValue (TextBox)!", False)
                                         Else
-                                            ClassLogger.Add(String.Format(" >> ClassControlCommandsUI.InsertControlValue (TextBox) was not successfull - ControlID: {0},RecordID: {1},value: {2}'", CONTROL_ID, CURRENT_RECORD_ID, value1), False)
+                                            LOGGER.Warn(String.Format("ClassControlCommandsUI.InsertControlValue (TextBox) was not successfull - ControlID: {0},RecordID: {1},value: {2}'", CONTROL_ID, CURRENT_RECORD_ID, value1), False)
                                         End If
 
 
                                     End If
                                 Catch ex As Exception
-                                    ClassLogger.Add("Unexpected Error in OnComboBoxValueChanged - TextBox: " & ex.Message, True)
+                                    LOGGER.Warn("Unexpected Error in OnComboBoxValueChanged - TextBox: " & ex.Message)
                                 End Try
                             Else
-                                ClassLogger.Add(" >> Attention: RowCount for depending control was '" & dt.Rows.Count.ToString & "' and not 1 as expected - Check SQL: '" & sqlcommand & "'")
+                                LOGGER.Warn("Attention: RowCount for depending control was '" & dt.Rows.Count.ToString & "' and not 1 as expected - Check SQL: '" & sqlcommand & "'")
                             End If
                         Case "GridControl"
                             Dim gridControl = DirectCast(dependingControl, DevExpress.XtraGrid.GridControl)
@@ -920,7 +920,7 @@ Public Class ClassControlBuilder
                 ControlLoader.DataGridViewCheckable.LoadValue(gridView.GridControl, values)
                 IsCancelCheck = False
             Catch ex As Exception
-                ClassLogger.Add("Error in OnFilterChanged: " & ex.Message)
+                LOGGER.Warn("Error in OnFilterChanged: " & ex.Message)
             End Try
         End If
     End Sub
@@ -1956,7 +1956,7 @@ Public Class ClassControlBuilder
 
             'End If
         Catch ex As Exception
-            ClassLogger.Add("Unexpected error in AutoCompleteComboKEyUp: " & ex.Message, True)
+            LOGGER.Warn("Unexpected error in AutoCompleteComboKEyUp: " & ex.Message)
 
         End Try
 
@@ -2544,7 +2544,7 @@ Public Class ClassControlBuilder
                                     For Each Col As DataColumn In DT_ListBox.Columns
                                         colstring = colstring & ";" & Col.ColumnName
                                     Next
-                                    ClassLogger.Add("Error in Binding CheckedListBox: " & ex.Message & " - Columns: " & colstring)
+                                    LOGGER.Warn("Error in Binding CheckedListBox: " & ex.Message & " - Columns: " & colstring)
                                     control.DisplayMember = DT_ListBox.Columns(0).ColumnName
                                 End Try
                             End If
@@ -2574,7 +2574,7 @@ Public Class ClassControlBuilder
                 Me.AddToPanel(control)
             End If
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in AddCheckedListBox: " & ex.Message)
+            LOGGER.Warn("Unexpected Error in AddCheckedListBox: " & ex.Message)
             MsgBox("Error in AddCheckedListBox: " + vbNewLine + ex.Message)
         End Try
     End Sub

app/DD-Record-Organizer/ClassControlCommands.vb

@@ -106,7 +106,7 @@
 
             SQL = $"INSERT INTO TBPMO_CONTROL (FORM_ID, CONTROL_TYPE_ID, DEFAULT_VALUE, NAME, COL_NAME, PARENT_CONTROL_ID, SQL_COMMAND_1) VALUES ({CURRENT_ENTITY_ID}, {CONTROL_TYPE_ID}, '', '{NAME}', '{NAME}', {PARENT_CONTROL_ID}, '')"
 
-            'If LogErrorsOnly = False Then ClassLogger.Add(SQL, True)
+            'LOGGER.Debug(SQL)
             If ClassDatabase.Execute_non_Query(SQL) = True Then
                 SQL = "SELECT MAX(GUID) FROM TBPMO_CONTROL"
                 Dim GUID = ClassDatabase.Execute_Scalar(SQL)
@@ -117,7 +117,7 @@
             End If
 
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in InsertControl: " & ex.Message, True)
+            LOGGER.Warn("Unexpected Error in InsertControl: " & ex.Message)
             MsgBox("Unexpected Error in InsertControl:" + vbNewLine + ex.Message, MsgBoxStyle.Critical)
             Return False
         End Try
@@ -168,7 +168,7 @@
             End If
 
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in InsertControlScreen: " & ex.Message, True)
+            LOGGER.Warn("Unexpected Error in InsertControlScreen: " & ex.Message)
             MsgBox("Unexpected Error in InsertControlScreen (Adding ViewProperties:" + vbNewLine + ex.Message, MsgBoxStyle.Critical)
             Return False
         End Try
@@ -193,7 +193,7 @@
                 Throw New Exception()
             End If
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in UpdateControlPosition: " & ex.Message, True)
+            LOGGER.Warn("Unexpected Error in UpdateControlPosition: " & ex.Message)
             MsgBox("Unexpected Error in UpdateControlPosition:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
             Return False
         End Try
@@ -371,7 +371,7 @@
                 Throw New Exception()
             End If
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in UpdateControl: " & ex.Message, True)
+            LOGGER.Warn("Unexpected Error in UpdateControl: " & ex.Message)
             MsgBox("Unexpected Error in UpdateControl:" + vbNewLine + ex.Message, MsgBoxStyle.Critical)
             Return False
         End Try
@@ -519,7 +519,7 @@
             End If
 
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in UpdateControlScreen: " & ex.Message, True)
+            LOGGER.Warn("Unexpected Error in UpdateControlScreen: " & ex.Message)
             MsgBox("Unexpected Error in UpdateControlScreen:" + vbNewLine + ex.Message, MsgBoxStyle.Critical)
             Return False
         End Try
@@ -534,7 +534,7 @@
                 Return False
             End If
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in Delete Control: " & ex.Message, True)
+            LOGGER.Warn("Unexpected Error in Delete Control: " & ex.Message)
             MsgBox("Unexpected Error in Delete Control:" + vbNewLine + ex.Message, MsgBoxStyle.Critical)
             Return False
         End Try
@@ -554,7 +554,7 @@
             End If
 
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in DeleteControlScreen: " & ex.Message, True)
+            LOGGER.Warn("Unexpected Error in DeleteControlScreen: " & ex.Message)
             MsgBox("Unexpected Error in DeleteControlScreen:" + vbNewLine + ex.Message, MsgBoxStyle.Critical)
             Return False
         End Try
@@ -570,7 +570,7 @@
                 Throw New Exception()
             End If
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in DeleteControlValues: " & ex.Message, True)
+            LOGGER.Warn("Unexpected Error in DeleteControlValues: " & ex.Message)
             MsgBox("Unexpected Error in DeleteControlValues:" + vbNewLine + ex.Message, MsgBoxStyle.Critical)
             Return False
         End Try

app/DD-Record-Organizer/ClassControlCommandsUI.vb

@@ -346,7 +346,7 @@ Public Class ClassControlCommandsUI
     Function SaveRecord(RecordID As Integer, FormID As Integer, Optional foreignRecordID As Integer = 0) As String
         Try
             Dim ADDED_WHO As String = USER_USERNAME
-            If LogErrorsOnly = False Then ClassLogger.Add(" >> (SaveRecord) Update RecordID: " & RecordID, False)
+            LOGGER.Debug("(SaveRecord) Update RecordID: " & RecordID, False)
             If UpdateAllControls(FormID, RecordID, _CtrlBuilder.AllControls) = True Then
                 Return "Datensatz aktualisiert - " & Now
             Else
@@ -513,7 +513,7 @@ Public Class ClassControlCommandsUI
                 Console.WriteLine("Updating Control " + ctrl.Name)
 
                 Dim CONTROL_ID As Integer = DirectCast(ctrl.Tag, ClassControlMetadata).Id 'GetControlID_for_RecordID(ctrl.Name, RecordID)
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> CONTROL_ID: " & CONTROL_ID, False)
+                LOGGER.Debug("CONTROL_ID: " & CONTROL_ID, False)
                 Dim CONTROL_VALUE As String = GetControlValue(ctrl)
                 Dim controltype = ctrl.GetType.ToString
                 If TypeOf ctrl Is PictureBox Then
@@ -554,7 +554,7 @@ Public Class ClassControlCommandsUI
                     'If CONTROL_ID = 995 Or CONTROL_ID = 996 Or CONTROL_ID = 997 Or CONTROL_ID = 810 Then
                     '    Console.WriteLine("sdasd")
                     'End If
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> InsertControlValue: " & CONTROL_ID & "|" & RecordID & "|" & CONTROL_VALUE, False)
+                    LOGGER.Debug("InsertControlValue: " & CONTROL_ID & "|" & RecordID & "|" & CONTROL_VALUE, False)
                     If Not IsNothing(CONTROL_VALUE) Then
                         If TypeOf ctrl Is CustomComboBox And CONTROL_VALUE = "" Then
                             'Exit Sub - Zuviel des guten
@@ -657,14 +657,14 @@ Public Class ClassControlCommandsUI
 
         Dim type = ctrl.GetType().Name
         Dim CONTROL_ID As Integer = DirectCast(ctrl.Tag, ClassControlMetadata).Id ' GetControlID_for_RecordID(ctrl.Name, CURRENT_RECORD_ID)
-        If LogErrorsOnly = False Then ClassLogger.Add(" >> GetControlValue CONTROL_ID: " & CONTROL_ID, False)
+        LOGGER.Debug("GetControlValue CONTROL_ID: " & CONTROL_ID, False)
         Dim CONTROL_VALUE As String = Nothing
-        If LogErrorsOnly = False Then ClassLogger.Add(" >> type = " & type.ToString, False)
+        LOGGER.Debug("type = " & type.ToString, False)
         Select Case type
             Case "TextBox"
                 Return DirectCast(ctrl, TextBox).Text
             Case "CustomComboBox"
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> Return Value: " & DirectCast(ctrl, CustomComboBox).Text, False)
+                LOGGER.Debug("Return Value: " & DirectCast(ctrl, CustomComboBox).Text, False)
                 Return DirectCast(ctrl, CustomComboBox).Text
             Case "CheckBox"
                 Return DirectCast(ctrl, CheckBox).Checked.ToString()
@@ -721,7 +721,7 @@ Public Class ClassControlCommandsUI
                                 If ClassDatabase.Execute_Scalar(SQL, True) = 1 Then
                                     SQL = "DELETE FROM TBPMO_RECORD_CONNECT WHERE RECORD1_ID = " & CURRENT_RECORD_ID & " AND RECORD2_ID = " & CInt(row(0))
                                     If ClassDatabase.Execute_non_Query(SQL) = True Then
-                                        If LogErrorsOnly = False Then ClassLogger.Add(" >> TBPMO_RECORD_CONNECT-Entry after 'deselect CheckedListBox' deleted", False)
+                                        LOGGER.Debug("TBPMO_RECORD_CONNECT-Entry after 'deselect CheckedListBox' deleted", False)
                                     End If
                                 End If
                             End If
@@ -749,14 +749,14 @@ Public Class ClassControlCommandsUI
                                         MsgBox("Attention: no current record Selected!", MsgBoxStyle.Exclamation)
                                     Else
                                         If ClassRecordCommands.ConnectRecord(CURRENT_RECORD_ID, CInt(row(0)), "CheckedListBox;" & ctrl.Name) = True Then
-                                            If LogErrorsOnly = False Then ClassLogger.Add(" >> Checked ListBox record  '" & rid.ToString & "' was linked successfully.", False)
+                                            LOGGER.Debug("Checked ListBox record  '" & rid.ToString & "' was linked successfully.", False)
                                         End If
                                     End If
 
                                 End If
                             End If
                         Catch ex As Exception
-                            ClassLogger.Add("Error in CheckedListBoxGetControlValue: " & ex.Message, True)
+                            LOGGER.Warn("Error in CheckedListBoxGetControlValue: " & ex.Message)
                         End Try
 
                     Next
@@ -881,7 +881,7 @@ Public Class ClassControlCommandsUI
             Return Value
         Catch ex As Exception
             MsgBox("Unexpected Error in Check_and_Format_Value: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-            ClassLogger.Add("Unexpected Error in Check_and_Format_Value: " & ex.Message, True)
+            LOGGER.Warn("Unexpected Error in Check_and_Format_Value: " & ex.Message)
             Return Nothing
         End Try
     End Function
@@ -915,7 +915,7 @@ Public Class ClassControlCommandsUI
         Catch ex As Exception
             Dim name = clsDatabase.Execute_Scalar("SELECT NAME FROM TBPMO_CONTROL WHERE GUID = " & ControlID, True)
             MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in CreateControlProcedure für Control: " & name)
-            ClassLogger.Add("Error in CreateControlProcedure: " & ex.Message, True)
+            LOGGER.Warn("Error in CreateControlProcedure: " & ex.Message, True)
             Return 0
         End Try
     End Function
@@ -940,7 +940,7 @@ Public Class ClassControlCommandsUI
             End If
         Catch ex As Exception
             MsgBox("Unexpected Error in inserting Control-Value: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-            ClassLogger.Add("Unexpected Error in inserting Control-Value: " & ex.Message, True)
+            LOGGER.Warn("Unexpected Error in inserting Control-Value: " & ex.Message)
             Return False
         End Try
     End Function
@@ -954,7 +954,7 @@ Public Class ClassControlCommandsUI
             Dim upd = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}', CHANGED_WHO = '{1}', CHANGE_STEP = {2} WHERE CONTROL_ID = {3} AND RECORD_ID = {4}",
                                     converted_value, CHANGED_WHO, CURRENT_CHANGE_STEP, ControlID, RecordID)
             If ControlID = 279 Or ControlID = 745 Then
-                ClassLogger.Add(upd, False, False)
+                LOGGER.Warn(upd)
             End If
             If LICENSE_PROXY = True Or clsDatabase.DB_PROXY_INITIALIZED = True Then
                 If ClassDatabase.Execute_non_Query(upd) = True Then
@@ -966,7 +966,7 @@ Public Class ClassControlCommandsUI
                 Return ClassDatabase.Execute_non_Query(upd)
             End If
         Catch ex As Exception
-            ClassLogger.Add("Unerwarteter Fehler in UpdateControlValue: " & ex.Message, True)
+            LOGGER.Warn("Unerwarteter Fehler in UpdateControlValue: " & ex.Message)
             Return False
         End Try
     End Function

app/DD-Record-Organizer/ClassControlLoader.vb

@@ -39,7 +39,7 @@
 
                 Return AutoValue
             Catch ex As Exception
-                ClassLogger.Add("Unexpected Error in LoadAutoValue: " & ex.Message, True)
+                LOGGER.Warn("Unexpected Error in LoadAutoValue: " & ex.Message)
                 Return Nothing
             End Try
 
@@ -264,8 +264,8 @@
                 End If
             Catch ex As Exception
                 MsgBox("Unexpected Error in LoadValueMain:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-                ClassLogger.Add("Unexpected Error in LoadValueMain: " & ex.Message, True)
+                LOGGER.Warn("Unexpected Error in LoadValueMain: " & ex.Message)
-                ClassLogger.Add(String.Format("ControlID: {0}" & vbNewLine & "recordid: {1}" & vbNewLine & "parentRecordId: {2}" & vbNewLine & "value: {3}" & vbNewLine & "entity_ID: {4}" & vbNewLine & "VARIABLE_VALUE: {5}", ControlId, recordId, parentRecordId, value, entity_ID, VARIABLE_VALUE), False)
+                LOGGER.Warn(String.Format("ControlID: {0}" & vbNewLine & "recordid: {1}" & vbNewLine & "parentRecordId: {2}" & vbNewLine & "value: {3}" & vbNewLine & "entity_ID: {4}" & vbNewLine & "VARIABLE_VALUE: {5}", ControlId, recordId, parentRecordId, value, entity_ID, VARIABLE_VALUE), False)
             End Try
 
         End Sub
@@ -281,7 +281,7 @@
                 control.Checked = result
             Catch ex As Exception
                 MsgBox("Unexpected Error in LoadValue1:" & vbNewLine & ex.Message)
-                ClassLogger.Add("Unexpected Error in LoadValue1: " & ex.Message, True)
+                LOGGER.Warn("Unexpected Error in LoadValue1: " & ex.Message)
             End Try
 
         End Sub
@@ -297,7 +297,7 @@
                 control.Checked = result
             Catch ex As Exception
                 MsgBox("Unexpected Error in LoadValue2:" & vbNewLine & ex.Message)
-                ClassLogger.Add("Unexpected Error in LoadValue2: " & ex.Message, True)
+                LOGGER.Warn("Unexpected Error in LoadValue2: " & ex.Message)
             End Try
 
         End Sub
@@ -368,7 +368,7 @@
 
             Catch ex As Exception
                 MsgBox("Unexpected Error in LoadValue3:" & vbNewLine & ex.Message)
-                ClassLogger.Add("Unexpected Error in LoadValue3: " & ex.Message, True)
+                LOGGER.Warn("Unexpected Error in LoadValue3: " & ex.Message)
             End Try
 
         End Sub

app/DD-Record-Organizer/ClassControlValues.vb

@@ -162,7 +162,7 @@ Public Class ClassControlValues
             sw.Done()
 
             If controls.Count = 0 Then
-                ClassLogger.Add("the control-Collection in LoadControlValuesNeu is empty!", True)
+                LOGGER.Warn("the control-Collection in LoadControlValuesNeu is empty!")
                 If (Not isGroupbox) Then
                     ENTITY_RELOAD_AFT_CONTROL_LOAD = True
                 End If
@@ -205,7 +205,7 @@ Public Class ClassControlValues
 
             sw.Done()
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in LoadControlValuesNeu: " & ex.Message, True)
+            LOGGER.Warn("Unexpected Error in LoadControlValuesNeu: " & ex.Message)
             MsgBox("Error in LoadControlValuesNeu:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
 
@@ -223,7 +223,7 @@ Public Class ClassControlValues
                 Return RESULT
             End If
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in GetControlValuesREC_CONTROL: " & ex.Message, True)
+            LOGGER.Warn("Unexpected Error in GetControlValuesREC_CONTROL: " & ex.Message)
             MsgBox("Error in GetControlValuesREC_CONTROL:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
             Return Nothing
         End Try
@@ -276,8 +276,8 @@ Public Class ClassControlValues
                     ControlLoader.Checkbox.LoadValue(checkbox, value)
 
                 Case GetType(RadioButton)
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Sub LoadControlValueNeu - GetType(RadioButton) ", False)
+                LOGGER.Debug("Sub LoadControlValueNeu - GetType(RadioButton) ", False)
-                    Dim radiobutton As RadioButton = DirectCast(control, RadioButton)
+                Dim radiobutton As RadioButton = DirectCast(control, RadioButton)
                     ControlLoader.RadioButton.LoadValue(radiobutton, value)
 
                 Case GetType(DevExpress.XtraEditors.DateEdit)
@@ -305,12 +305,12 @@ Public Class ClassControlValues
                     ControlLoader.DataGridViewCheckable.LoadValue(gridcontrol, values)
                 Case Else
                     If GetType(Control).ToString() <> "System.Windows.Forms.Control" Then
-                        ClassLogger.Add(" >> Sub LoadControlValue - Control-Type nicht berücksichtigt: " & GetType(Control).ToString(), False)
+                    LOGGER.Warn("Sub LoadControlValue - Control-Type nicht berücksichtigt: " & GetType(Control).ToString(), False)
-                    End If
+                End If
 
             End Select
         'Catch ex As Exception
-        '    ClassLogger.Add("Unexpected Error in LoadControlValue: " & ex.Message, True)
+        '    Logger.Warn("Unexpected Error in LoadControlValue: " & ex.Message)
         '    MsgBox("Error in LoadControlValue:" & vbNewLine & ex.Message)
         'End Try
 
@@ -322,7 +322,7 @@ Public Class ClassControlValues
 
             If controls.Count = 0 Then
                 'MsgBox("LoadControlValuesList: Control.ControlCollection is unexpected empty!", MsgBoxStyle.Exclamation)
-                ClassLogger.Add("LoadControlValuesList: Control.ControlCollection is unexpected empty!")
+                LOGGER.Warn("LoadControlValuesList: Control.ControlCollection is unexpected empty!")
                 Exit Sub
             End If
 
@@ -380,7 +380,7 @@ Public Class ClassControlValues
 
             sw.Done()
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in LoadControlValuesList: " & ex.Message, True)
+            LOGGER.Warn("Unexpected Error in LoadControlValuesList: " & ex.Message)
             MsgBox("Unexpected Error in LoadControlValuesList:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
 
@@ -391,7 +391,7 @@ Public Class ClassControlValues
         Try
             If controls.Count = 0 Then
                 'MsgBox("LoadControlValuesListWithPlaceholders: Control.ControlCollection is unexpected empty!", MsgBoxStyle.Exclamation)
-                ClassLogger.Add("LoadControlValuesListWithPlaceholders: Control.ControlCollection is unexpected empty!")
+                LOGGER.Warn("LoadControlValuesListWithPlaceholders: Control.ControlCollection is unexpected empty!")
                 Exit Sub
             End If
 
@@ -428,7 +428,7 @@ Public Class ClassControlValues
                             End If
                         End If
                     Catch ex As Exception
-                        ClassLogger.Add("Unexpected Error in Getting Parent-Record cause PRecord was 0: " & ex.Message)
+                        LOGGER.Warn("Unexpected Error in Getting Parent-Record cause PRecord was 0: " & ex.Message)
                     End Try
                 End If
 
@@ -459,7 +459,7 @@ Public Class ClassControlValues
             Next
             sw.Done()
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in LoadControlValuesListWithPlaceholders: " & ex.Message, True)
+            LOGGER.Warn("Unexpected Error in LoadControlValuesListWithPlaceholders: " & ex.Message)
             MsgBox("Unexpected Error in LoadControlValuesListWithPlaceholders:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
     End Sub
@@ -474,7 +474,7 @@ Public Class ClassControlValues
         Try
             If controls.Count = 0 Then
                 'MsgBox("LoadControlValuesListWithPlaceholders: Control.ControlCollection is unexpected empty!", MsgBoxStyle.Exclamation)
-                ClassLogger.Add("Enable_Depending_Controls: Control.ControlCollection is unexpected empty!")
+                LOGGER.Warn("Enable_Depending_Controls: Control.ControlCollection is unexpected empty!")
                 Exit Sub
             End If
             ' Alle Controls finden, die Abhängigkeiten haben
@@ -490,12 +490,12 @@ Public Class ClassControlValues
 
             ' Durchlaufe alle Controls, die eine Abhängigheit haben
             For Each row As DataRow In dt.Rows
-                Dim msg = String.Format(" >> Working on Depending Control-ID: {0}", row.Item("GUID").ToString)
+                Dim msg = String.Format("Working on Depending Control-ID: {0}", row.Item("GUID").ToString)
-                If LogErrorsOnly = False Then ClassLogger.Add(msg, False)
+                LOGGER.Debug(msg, False)
                 Dim DependingControlId As Integer = row.Item("GUID")
                 Dim DependingControlSQL As String = row.Item("SQL_COMMAND_2")
-                msg = String.Format(" >> SQL: {0}", DependingControlSQL)
+                msg = String.Format("SQL: {0}", DependingControlSQL)
-                If LogErrorsOnly = False Then ClassLogger.Add(msg, False)
+                LOGGER.Debug(msg, False)
                 Dim DependingControl As Control = controls.OfType(Of Control)().Where(Function(c As Control)
                                                                                           Return DirectCast(c.Tag, ClassControlMetadata).Id = DependingControlId
                                                                                       End Function).SingleOrDefault()
@@ -525,31 +525,31 @@ Public Class ClassControlValues
                     ' Jetzt lesen wir den Wert aus, der im SQL Command ersetzt werden soll
                     Select Case otherControlType
                         Case "CheckBox"
-                            msg = String.Format(" >> CheckBox-CtrlID: {0}", otherControlId)
+                            msg = String.Format("CheckBox-CtrlID: {0}", otherControlId)
-                            If LogErrorsOnly = False Then ClassLogger.Add(msg, False)
+                            LOGGER.Debug(msg, False)
                             value = DirectCast(otherControl, CheckBox).Checked
                         Case "TextBox"
-                            msg = String.Format(" >> TextBox-CtrlID: {0}", otherControlId)
+                            msg = String.Format("TextBox-CtrlID: {0}", otherControlId)
-                            If LogErrorsOnly = False Then ClassLogger.Add(msg, False)
+                            LOGGER.Debug(msg, False)
                             value = DirectCast(otherControl, TextBox).Text
                         Case "CustomComboBox"
-                            msg = String.Format(" >> CustomComboBox-CtrlID: {0}", otherControlId)
+                            msg = String.Format("CustomComboBox-CtrlID: {0}", otherControlId)
-                            If LogErrorsOnly = False Then ClassLogger.Add(msg, False)
+                            LOGGER.Debug(msg, False)
                             value = DirectCast(otherControl, CustomComboBox).Text
                         Case "DateEdit"
-                            msg = String.Format(" >> DateEdit-CtrlID: {0}", otherControlId)
+                            msg = String.Format("DateEdit-CtrlID: {0}", otherControlId)
-                            If LogErrorsOnly = False Then ClassLogger.Add(msg, False)
+                            LOGGER.Debug(msg, False)
                             value = DirectCast(otherControl, DevExpress.XtraEditors.DateEdit).EditValue
                     End Select
 
                     ' Jetzt ersetzen wir den Platzhalter im SQL Command
                     DependingControlSQL = regex.Replace(DependingControlSQL, value)
-                    msg = String.Format(" >> DependingControlSQL: {0}", DependingControlSQL)
+                    msg = String.Format("DependingControlSQL: {0}", DependingControlSQL)
-                    If LogErrorsOnly = False Then ClassLogger.Add(msg, False)
+                    LOGGER.Debug(msg, False)
                     Dim enableDT As DataTable = ClassDatabase.Return_Datatable(DependingControlSQL)
                     If IsNothing(enableDT) Then
-                        msg = String.Format(">> enableDT is nothing!! CHECK SQL {0}." & vbNewLine, DependingControlSQL)
+                        msg = String.Format("enableDT is nothing!! CHECK SQL {0}." & vbNewLine, DependingControlSQL)
-                        ClassLogger.Add(msg)
+                        LOGGER.Warn(msg)
                         Continue For
                     End If
                     If enableDT.Rows.Count = 1 Then
@@ -557,28 +557,28 @@ Public Class ClassControlValues
                         Try
                             enabled = CBool(enableDT.Rows(0).Item(0))
                         Catch ex As Exception
-                            msg = String.Format(">> Could not convert value of tablecontent to boolean!! SQL {0} # tablecontent: {1}" & vbNewLine, DependingControlSQL, enableDT.Rows(0).Item(0).ToString)
+                            msg = String.Format("Could not convert value of tablecontent to boolean!! SQL {0} # tablecontent: {1}" & vbNewLine, DependingControlSQL, enableDT.Rows(0).Item(0).ToString)
-                            ClassLogger.Add(msg)
+                            LOGGER.Warn(msg)
                         End Try
 
                         DependingControl.Enabled = enabled
                         If enabled = False Then
-                            msg = String.Format(" >> Control {0} will be disabled." & vbNewLine, DependingControlId.ToString)
+                            msg = String.Format("Control {0} will be disabled." & vbNewLine, DependingControlId.ToString)
-                            If LogErrorsOnly = False Then ClassLogger.Add(msg, False)
+                            LOGGER.Debug(msg, False)
                         Else
-                            msg = String.Format(" >> Control {0} will be enabled." & vbNewLine, DependingControlId.ToString)
+                            msg = String.Format("Control {0} will be enabled." & vbNewLine, DependingControlId.ToString)
-                            If LogErrorsOnly = False Then ClassLogger.Add(msg, False)
+                            LOGGER.Debug(msg, False)
                         End If
 
                     Else
-                        ClassLogger.Add(" >> Attention in Enable_Depending_Controls: RowCount for enabling control was '" & enableDT.Rows.Count.ToString & "' and not 1 as expected - Check SQL: '" & DependingControlSQL & "'")
+                        LOGGER.Warn("Attention in Enable_Depending_Controls: RowCount for enabling control was '" & enableDT.Rows.Count.ToString & "' and not 1 as expected - Check SQL: '" & DependingControlSQL & "'")
                     End If
                 End If
             Next
 
             sw.done
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in Enable_Depending_Controls: " & ex.Message, True)
+            LOGGER.Warn("Unexpected Error in Enable_Depending_Controls: " & ex.Message, True)
             MsgBox("Unexpected Error in Enable_Depending_Controls:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
     End Sub
@@ -591,7 +591,7 @@ Public Class ClassControlValues
             sqlCommand = sqlCommand.Replace("@PARENTRECORDID", parentRecordId)
             Return sqlCommand
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in ReplaceSqlCommandPlaceholders: " & ex.Message, True)
+            LOGGER.Warn("Unexpected Error in ReplaceSqlCommandPlaceholders: " & ex.Message)
             MsgBox("Unexpected Error in ReplaceSqlCommandPlaceholders:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
             Return sqlCommand
         End Try
@@ -728,7 +728,7 @@ Public Class ClassControlValues
                     Dim control As Control = controls.Find(controlName, False)(0)
                     LoadDefaultValue(controlId, RecordID, Control, parentRecordID, EntityID, defaultValue)
                 Catch ex As Exception
-                    ClassLogger.Add("Unexpected Error in getting default value for control '" & controlName & " - " & ex.Message, True)
+                    LOGGER.Warn("Unexpected Error in getting default value for control '" & controlName & " - " & ex.Message, True)
                 End Try
             Next
 
@@ -884,7 +884,7 @@ Public Class ClassControlValues
             CURRENT_LAST_SQL = sql
             Return ClassDatabase.Execute_Scalar(sql)
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in GetControlValueForControlID: " & ex.Message, True)
+            LOGGER.Warn("Unexpected Error in GetControlValueForControlID: " & ex.Message)
             MsgBox("Error in GetControlValueForControlID:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
             Return Nothing
         End Try

app/DD-Record-Organizer/ClassControls_Manual.vb

@@ -21,7 +21,7 @@
             End If
             Return chk
         Catch ex As Exception
-            ClassLogger.Add("Unhandled Exception in AddCheckBox: " & ex.Message, True)
+            LOGGER.Warn("Unhandled Exception in AddCheckBox: " & ex.Message)
             Return Nothing
         End Try
 

app/DD-Record-Organizer/ClassCustomComboBox.vb

@@ -39,7 +39,7 @@
                         label = rowView.Item(1)
                     End If
                 Catch ex As Exception
-                    ClassLogger.Add("Unexpected error in OnDrawItem (datatable): " & ex.Message, True)
+                    LOGGER.Warn("Unexpected error in OnDrawItem (datatable): " & ex.Message)
                 End Try
 
             End If

app/DD-Record-Organizer/ClassDOC_SEARCH.vb

@@ -31,7 +31,7 @@ Public Class ClassDOC_SEARCH
                 OPTION4 = DT_RESULTLIST_OPTIONS.Rows(0).Item("OPTION4_CTRL")
                 OPTION5 = DT_RESULTLIST_OPTIONS.Rows(0).Item("OPTION5_CTRL")
             End If
-            If LogErrorsOnly = False Then ClassLogger.Add(" >> DT_RESULTLIST_SEL_VALUES.Rows.Count: " & DT_RESULTLIST_SEL_VALUES.Rows.Count, False)
+            LOGGER.Debug("DT_RESULTLIST_SEL_VALUES.Rows.Count: " & DT_RESULTLIST_SEL_VALUES.Rows.Count, False)
             If DT_RESULTLIST_SEL_VALUES.Rows.Count = 0 Then
                 VALUE_CONF1 = 0
                 VALUE_CONF2 = 0
@@ -209,7 +209,7 @@ Public Class ClassDOC_SEARCH
                   "WHERE TR.FORM_ID  = {1} AND TTEMP.USER_ID = {2} AND TRIGHTS.dwUserOrGroupID = {3}" & vbNewLine &
                   "AND T.DocID IN ({6})", USER_LANGUAGE, ENTITY_ID, USER_GUID, USERID_FK_INT_ECM, OPTION1, OPTION2, sqlft)
             End If
-            If LogErrorsOnly = False Then ClassLogger.Add(" >> SQL_DOC_SEARCH: " & SQL_DOC_SEARCH, False)
+            LOGGER.Debug("SQL_DOC_SEARCH: " & SQL_DOC_SEARCH, False)
             If BG = True And CURRENT_SEARCH_TYPE = "ENTITY" Then
                 If Not IsNothing(CURRENT_DT_DOC_ENTITY_SEARCH) Then
                     Return CURRENT_DT_DOC_ENTITY_SEARCH
@@ -230,7 +230,7 @@ Public Class ClassDOC_SEARCH
 
             Return DTFILE_RESULT_ASYNC 'ClassDatabase.Return_Datatable(SQL_DOC_SEARCH, True)
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in GET_DOCSEARCH_DATATABLE: " & ex.Message, True)
+            LOGGER.Warn("Unexpected Error in GET_DOCSEARCH_DATATABLE: " & ex.Message)
             Return Nothing
         End Try
     End Function
@@ -253,7 +253,7 @@ Public Class ClassDOC_SEARCH
             Dim DT_FILE_RESULT As DataTable = GET_DOCSEARCH_DATATABLE(BG)
             CURRENT_DOC_RESULTS = DT_FILE_RESULT
             If IsNothing(DT_FILE_RESULT) Then
-                ClassLogger.Add(">> ATTENTION: GET_DOCSEARCH_DATATABLE IS NOTHING!!", False)
+                LOGGER.Warn("ATTENTION: GET_DOCSEARCH_DATATABLE IS NOTHING!!", False)
                 Return Nothing
             End If
             sw.Done()
@@ -333,13 +333,13 @@ Public Class ClassDOC_SEARCH
                             oDTGrid.Columns.Add(oColumn)
                             ColCount += 1
                         Catch ex As Exception
-                            ClassLogger.Add(String.Format("Unexpected Error in DTGrid.Columns.Add({0}) - CONSTR_DET_ID: {1} ", ColumnName, CURRENT_CONSTRUCTOR_DETAIL_ID) & ex.Message)
+                            LOGGER.Warn(String.Format("Unexpected Error in DTGrid.Columns.Add({0}) - CONSTR_DET_ID: {1} ", ColumnName, CURRENT_CONSTRUCTOR_DETAIL_ID) & ex.Message)
                         End Try
                     Next
                     _step = "7.1"
                 End If
             Catch ex As Exception
-                ClassLogger.Add("Unexpected Error in Construct Datatable: " & ex.Message)
+                LOGGER.Warn("Unexpected Error in Construct Datatable: " & ex.Message)
                 MsgBox("Unexpected Error in Construct Datatable for GridResult: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
             End Try
             sw.Done()
@@ -411,9 +411,9 @@ Public Class ClassDOC_SEARCH
                     Try
                         rowvalue = FILE_ROW.Item(Colname)
                         _step = "9.1  rowvalue for Colname [" & Colname & "]: [" & rowvalue.ToString & "]"
-                        If LogErrorsOnly = False Then ClassLogger.Add(" >> rowvalue for Colname [" & Colname & "]: [" & rowvalue.ToString & "]", False)
+                        LOGGER.Debug("rowvalue for Colname [" & Colname & "]: [" & rowvalue.ToString & "]", False)
                     Catch ex As Exception
-                        If CURRENT_SEARCH_TYPE = "RECORD" Then ClassLogger.Add("Unexpected Error in GetVariableValue for Column '" & Colname & "'- Error: " & ex.Message)
+                        If CURRENT_SEARCH_TYPE = "RECORD" Then LOGGER.Warn("Unexpected Error in GetVariableValue for Column '" & Colname & "'- Error: " & ex.Message)
                         If Colname.ToString.StartsWith("doct") Or Colname.ToString.StartsWith("Dokum") Then
                             rowvalue = ""
                         Else
@@ -426,7 +426,7 @@ Public Class ClassDOC_SEARCH
                         End If
                     End Try
                     _step = "9.2 now: NewRow.Item(i) = rowvalue.ToString..."
-                    If LogErrorsOnly = False Then ClassLogger.Add("9.2 now: NewRow.Item(i) = rowvalue.ToString...", False)
+                    LOGGER.Debug("9.2 now: NewRow.Item(i) = rowvalue.ToString...", False)
                     Try
 
                     Catch ex As Exception
@@ -435,21 +435,21 @@ Public Class ClassDOC_SEARCH
 
                     Try
                         'If oDTGrid.Columns(i).DataType.ToString = "System.DateTime" And rowvalue = String.Empty Then
-                        '    If LogErrorsOnly = False Then ClassLogger.Add("rowvalue Is empty and Column is Datetime...", False)
+                        '    LOGGER.Debug("rowvalue Is empty and Column is Datetime...", False)
                         'Else
                         oNewRow.Item(i) = rowvalue.ToString
                         'End If
 
                     Catch ex As Exception
-                        ClassLogger.Add("Error in advising value to rowitem (oNewRow.Item(i) = rowvalue.ToString): " + ex.Message, False)
+                        LOGGER.Warn("Error in advising value to rowitem (oNewRow.Item(i) = rowvalue.ToString): " + ex.Message, False)
-                        ClassLogger.Add("Type of column: " + oDTGrid.Columns(i).DataType.ToString(), False)
+                        LOGGER.Warn("Type of column: " + oDTGrid.Columns(i).DataType.ToString(), False)
                     End Try
 
                     i += 1
                 Next
                 oDTGrid.Rows.Add(oNewRow)
                 '                Catch ex As Exception
-                '                    ClassLogger.Add("Unexpected Error in CreateRow for doc '" & filename & "- Error: " & ex.Message)
+                '                    Logger.Warn("Unexpected Error in CreateRow for doc '" & filename & "- Error: " & ex.Message)
                 '                End Try
             Next
             _step = "10"
@@ -459,7 +459,7 @@ Public Class ClassDOC_SEARCH
             sw.Done()
         Catch ex As Exception
             MsgBox("Unexpected Error in Get_DOC_RESULTTABLE (Step " & _step & "): " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-            ClassLogger.Add("Unexpected Error in Get_DOC_RESULTTABLE (Step " & _step & "): " & ex.Message)
+            LOGGER.Warn("Unexpected Error in Get_DOC_RESULTTABLE (Step " & _step & "): " & ex.Message)
             Return Nothing
         End Try
     End Function
@@ -496,7 +496,7 @@ Public Class ClassDOC_SEARCH
                 MsgBox("No Record selected - Please select one!", MsgBoxStyle.Exclamation)
                 Return False
             End If
-            If LogErrorsOnly = False Then ClassLogger.Add("#### SETTING RIGHTS FOR FILE ######", False)
+            LOGGER.Debug("#### SETTING RIGHTS FOR FILE ######", False)
             If ClassWDRights.Init = True Then
                 If ClassWDRights.Doc_Renew_Rights(RESULT_DOCID, RESULT_DOC_PATH, True) Then
                     If ClassWDRights.MSG_RESULT <> "" Then
@@ -573,7 +573,7 @@ Public Class ClassDOC_SEARCH
             End Select
 
         Catch ex As Exception
-            clsLogger.Add("Unexpected Error in Get_File_Rights: " & ex.Message, True)
+            clsLogger.Add("Unexpected Error in Get_File_Rights: " & ex.Message)
             Return Nothing
         End Try
     End Function

app/DD-Record-Organizer/ClassDatabase.vb

@@ -14,7 +14,7 @@ Public Class ClassDatabase
             SQLconnect.Close()
             Return True
         Catch ex As Exception
-            ClassLogger.Add("Error in DatabaseInit: " & ex.Message, True)
+            LOGGER.Warn("Error in DatabaseInit: " & ex.Message)
             Return False
         End Try
     End Function
@@ -52,15 +52,15 @@ Public Class ClassDatabase
                         Dim conn As New OdbcConnection("dsn=" & DTConnection.Rows(0).Item("SERVER") & ";uid=" & DTConnection.Rows(0).Item("USERNAME") & ";pwd=" + DTConnection.Rows(0).Item("PASSWORD"))
                         connectionString = conn.ConnectionString
                     Case Else
-                        ClassLogger.Add(" - ConnectionType nicht integriert", False)
+                        LOGGER.Warn("ConnectionType nicht integriert")
                         MsgBox("ConnectionType nicht integriert", MsgBoxStyle.Critical, "Bitte Konfiguration Connection überprüfen!")
                 End Select
             Else
-                ClassLogger.Add(" No entry for Connection-ID: " & id.ToString, True)
+                LOGGER.Warn(" No entry for Connection-ID: " & id.ToString)
             End If
 
         Catch ex As Exception
-            ClassLogger.Add(" - Error in bei GetConnectionString - Fehler: " & vbNewLine & ex.Message)
+            LOGGER.Warn(" - Error in bei GetConnectionString - Fehler: " & vbNewLine & ex.Message)
             MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in GetConnectionString:")
         End Try
         Return connectionString
@@ -84,7 +84,7 @@ Public Class ClassDatabase
             SQLconnect.Open()
             SQLcommand = SQLconnect.CreateCommand
             SQLcommand.CommandText = Select_anweisung
-            SQLcommand.CommandTimeout = 180
+            SQLcommand.CommandTimeout = 360
             Dim adapter1 As SqlClient.SqlDataAdapter = New SqlClient.SqlDataAdapter(SQLcommand)
             Dim dt As DataTable = New DataTable()
 
@@ -96,9 +96,9 @@ Public Class ClassDatabase
             Return dt
         Catch ex As Exception
             MsgBox("Error in Return_Datatable: " & ex.Message & vbNewLine & vbNewLine & Select_anweisung, MsgBoxStyle.Critical)
-            ClassHelper.InsertEssential_Log(CURRENT_RECORD_ID, "RECORD-ID", ex.Message & " - SQL: " & Select_anweisung)
+            ' ClassHelper.InsertEssential_Log(CURRENT_RECORD_ID, "RECORD-ID", ex.Message & " - SQL: " & Select_anweisung)
-            ClassLogger.Add("Error in Return_Datatable: " & ex.Message, True)
+            LOGGER.Warn("Error in Return_Datatable: " & ex.Message)
-            ClassLogger.Add(">> SQL: " & Select_anweisung, False)
+            LOGGER.Warn("SQL: " & Select_anweisung)
             If (ex.Message.Contains("Ungültiger Objektname") Or ex.Message.Contains("Invalid Object Name")) And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
                 MsgBox("A database-object could not be found but synchronization of Proxyserver might be in action! So please try again in a few seconds/minutes!", MsgBoxStyle.Exclamation)
             End If
@@ -136,7 +136,7 @@ Public Class ClassDatabase
             End If
 
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in MSSQL_ReturnDTWithConnection: " & vbNewLine & ex.Message & vbNewLine & vbNewLine & sql)
+            LOGGER.Warn("Unexpected Error in MSSQL_ReturnDTWithConnection: " & vbNewLine & ex.Message & vbNewLine & vbNewLine & sql)
             MsgBox("Unexpected Error in MSSQL_ReturnDTWithConnection:" & vbNewLine & ex.Message & vbNewLine & vbNewLine & sql, MsgBoxStyle.Critical)
             Return Nothing
         End Try
@@ -164,8 +164,8 @@ Public Class ClassDatabase
             If userInput = True Then
                 MsgBox("Error in Return_Datatable_CS - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & Select_anweisung, MsgBoxStyle.Critical)
             End If
-            ClassLogger.Add("Error in Return_Datatable_CS: " & ex.Message, True)
+            LOGGER.Warn("Error in Return_Datatable_CS: " & ex.Message)
-            ClassLogger.Add("#SQL: " & Select_anweisung, False)
+            LOGGER.Warn("#SQL: " & Select_anweisung)
             Return Nothing
         End Try
     End Function
@@ -199,8 +199,8 @@ Public Class ClassDatabase
             If userInput = True Then
                 MsgBox("Error in Return_Datatable_Connection - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & Select_anweisung, MsgBoxStyle.Critical)
             End If
-            ClassLogger.Add("Error in Return_Datatable_Connection: " & ex.Message)
+            LOGGER.Warn("Error in Return_Datatable_Connection: " & ex.Message)
-            ClassLogger.Add("#SQL: " & Select_anweisung)
+            LOGGER.Warn("#SQL: " & Select_anweisung)
             Return Nothing
         End Try
     End Function
@@ -231,8 +231,8 @@ Public Class ClassDatabase
             'If Userinput = True Then
             '    MsgBox("Error in Execute_non_Query: " & ex.Message & vbNewLine & vbNewLine & ExecuteCMD, MsgBoxStyle.Critical)
             'End If
-            ClassLogger.Add("Error in Execute_non_Query: " & ex.Message)
+            LOGGER.Warn("Error in Execute_non_Query: " & ex.Message)
-            ClassLogger.Add("SQL: " & ExecuteCMD)
+            LOGGER.Warn("SQL: " & ExecuteCMD)
 
             Return False
         End Try
@@ -266,8 +266,8 @@ Public Class ClassDatabase
             End If
 
         Catch ex As Exception
-            ClassLogger.Add("Error in Execute_non_Query_withConn: " & ex.Message, True)
+            LOGGER.Warn("Error in Execute_non_Query_withConn: " & ex.Message)
-            ClassLogger.Add("SQL: " & ExecuteCMD, False)
+            LOGGER.Warn("SQL: " & ExecuteCMD)
             Return False
         End Try
     End Function
@@ -294,8 +294,8 @@ Public Class ClassDatabase
 
 
         Catch ex As Exception
-            ClassLogger.Add("Error in Execute_non_Query_withConnString: " & ex.Message, True)
+            LOGGER.Warn("Error in Execute_non_Query_withConnString: " & ex.Message)
-            ClassLogger.Add("SQL: " & ExecuteCMD, False)
+            LOGGER.Warn("SQL: " & ExecuteCMD)
             Return False
         End Try
     End Function
@@ -318,8 +318,8 @@ Public Class ClassDatabase
             If Userinput = True Then
                 MsgBox("Error in Execute_non_Query_Async: " & ex.Message & vbNewLine & vbNewLine & ExecuteCMD, MsgBoxStyle.Critical)
             End If
-            ClassLogger.Add("Error in Execute_non_Query_Async: " & ex.Message, True)
+            LOGGER.Warn("Error in Execute_non_Query_Async: " & ex.Message)
-            ClassLogger.Add("SQL: " & ExecuteCMD, False)
+            LOGGER.Warn("SQL: " & ExecuteCMD)
         Finally
             SQLcommand.Dispose()
             SQLconnect.Close()
@@ -330,7 +330,7 @@ Public Class ClassDatabase
         Dim command As SqlClient.SqlCommand = CType(result.AsyncState, SqlClient.SqlCommand)
         Dim res = command.EndExecuteNonQuery(result)
 
-        ClassLogger.Add(String.Format("Finished executing Async database operation: {0}", command.CommandText), False)
+        LOGGER.Warn(String.Format("Finished executing Async database operation: {0}", command.CommandText))
     End Sub
 
     Public Shared Function Execute_Scalar(cmdscalar As String, Optional USE_PROXY As Boolean = False)
@@ -364,8 +364,8 @@ Public Class ClassDatabase
             'If Userinput = True Then
             '    MsgBox("Error in Execute_Scalar: " & ex.Message & vbNewLine & vbNewLine & cmdscalar, MsgBoxStyle.Critical)
             'End If
-            ClassLogger.Add("Error in Execute_Scalar: " & ex.Message, True)
+            LOGGER.Warn("Error in Execute_Scalar: " & ex.Message)
-            ClassLogger.Add("SQL: " & cmdscalar, False)
+            LOGGER.Warn("SQL: " & cmdscalar)
             Return Nothing
         End Try
     End Function
@@ -390,13 +390,13 @@ Public Class ClassDatabase
                 Return result
             Else
                 MsgBox("No Connection for ID: " & connectionId & " - ExecuteScalar: " & cmdscalar, MsgBoxStyle.Exclamation)
-                ClassLogger.Add("No Connection for ID: " & connectionId & " - ExecuteScalar: " & cmdscalar)
+                LOGGER.Warn("No Connection for ID: " & connectionId & " - ExecuteScalar: " & cmdscalar)
                 Return Nothing
             End If
 
         Catch ex As Exception
-            ClassLogger.Add("Error in Execute_ScalarWithConnection: " & ex.Message, True)
+            LOGGER.Warn("Error in Execute_ScalarWithConnection: " & ex.Message)
-            ClassLogger.Add("SQL: " & cmdscalar, False)
+            LOGGER.Warn("SQL: " & cmdscalar)
             Return Nothing
         End Try
     End Function
@@ -417,8 +417,8 @@ Public Class ClassDatabase
             SQLconnect.Close()
             Return result
         Catch ex As Exception
-            ClassLogger.Add("Error in Execute_ScalarWithConnectionString: " & ex.Message, True)
+            LOGGER.Warn("Error in Execute_ScalarWithConnectionString: " & ex.Message)
-            ClassLogger.Add("SQL: " & cmdscalar, False)
+            LOGGER.Warn("SQL: " & cmdscalar)
             Return Nothing
         End Try
     End Function
@@ -438,8 +438,8 @@ Public Class ClassDatabase
             SQLconnect.Close()
             Return result
         Catch ex As Exception
-            ClassLogger.Add("Error in OracleExecute_Scalar: " & ex.Message, True)
+            LOGGER.Warn("Error in OracleExecute_Scalar: " & ex.Message)
-            ClassLogger.Add("#SQL: " & cmdscalar, False)
+            LOGGER.Warn("#SQL: " & cmdscalar)
             Return Nothing
         End Try
     End Function
@@ -460,8 +460,8 @@ Public Class ClassDatabase
             If userInput = True Then
                 MsgBox("Error in OracleExecute_non_Query - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & ExecuteCMD, MsgBoxStyle.Critical)
             End If
-            ClassLogger.Add("Error in OracleExecute_non_Query: " & ex.Message, True)
+            LOGGER.Warn("Error in OracleExecute_non_Query: " & ex.Message)
-            ClassLogger.Add("#SQL: " & ExecuteCMD, False)
+            LOGGER.Warn("#SQL: " & ExecuteCMD)
 
             Return False
         End Try
@@ -485,8 +485,8 @@ Public Class ClassDatabase
             If userInput = True Then
                 MsgBox("Error in Oracle Return Datatable - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & Select_anweisung, MsgBoxStyle.Critical)
             End If
-            ClassLogger.Add("Error in Oracle_Return_Datatable: " & ex.Message, True)
+            LOGGER.Warn("Error in Oracle_Return_Datatable: " & ex.Message)
-            ClassLogger.Add("#SQL: " & Select_anweisung, False)
+            LOGGER.Warn("#SQL: " & Select_anweisung)
             Return Nothing
         End Try
     End Function

app/DD-Record-Organizer/ClassDragDrop.vb

@@ -5,7 +5,7 @@ Public Class ClassDragDrop
     Public Shared files_dropped As String()
     Public Shared Function Drop_File(e As DragEventArgs)
         Try
-            If LogErrorsOnly = False Then ClassLogger.Add(" >> In Drop_File....", False)
+            LOGGER.Debug("In Drop_File....")
             files_dropped = Nothing
 
             Dim sql As String = "DELETE FROM TBPMO_FILES_USER WHERE HANDLE_TYPE <> 'SCAN' AND UPPER(USER_WORK) = UPPER('" & USER_USERNAME & "')"
@@ -13,14 +13,14 @@ Public Class ClassDragDrop
 
 
             If e.Data.GetDataPresent(DataFormats.FileDrop) Then
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> Simple File Drop", False)
+                LOGGER.Debug("Simple File Drop")
                 Dim MyFiles() As String
                 Dim i As Integer
                 ' Assign the files to an array. 
                 MyFiles = e.Data.GetData(DataFormats.FileDrop)
                 ' Loop through the array and add the files to the list. 
                 For i = 0 To MyFiles.Length - 1
-                    ClassLogger.Add(">> Simple FileDrop - File: " & MyFiles(i), False)
+                    LOGGER.Info("Simple FileDrop - File: " & MyFiles(i))
                     ReDim Preserve files_dropped(i)
                     files_dropped(i) = "@DROPFROMFSYSTEM@" & MyFiles(i)
                     ' ListBox1.Items.Add(MyFiles(i))
@@ -60,7 +60,7 @@ Public Class ClassDragDrop
                 '// get the actual raw file into memory
                 Dim msInput As IO.MemoryStream = CType(e.Data.GetData("FileContents", True), IO.MemoryStream) 'This returns nothing for an Email
                 If msInput Is Nothing = False Then
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Drag of Outlook Attachment", False)
+                    LOGGER.Debug("Drag of Outlook Attachment")
                     '// allocate enough bytes to hold the raw date
                     Dim aryFileBytes(CType(msInput.Length, Int32)) As Byte
                     '// set starting position at first byte and read in the raw data
@@ -79,17 +79,17 @@ Public Class ClassDragDrop
                     If (finTemp.Exists = True) Then
                         ReDim Preserve files_dropped(0)
                         files_dropped(0) = "@OUTLOOK_ATTACHMENT@" & strOutFile
-                        If LogErrorsOnly = False Then ClassLogger.Add(" >> Drop an Attachment - File: " & strOutFile, False)
+                        LOGGER.Debug("Drop an Attachment - File: " & strOutFile)
                         Return True
                     Else
-                        ClassLogger.Add(">> Attachment File from Outlook could not be created", False)
+                        LOGGER.Warn("Attachment File from Outlook could not be created")
                     End If
                 Else
-                    ClassLogger.Add(">> No simple drag and drop.", True, False)
+                    LOGGER.Warn("No simple drag and drop.", True)
                     For Each fmt As String In e.Data.GetFormats()
                         ' Output format name and type
-                        ClassLogger.Add(">> e.Data is: " & fmt + " (" +
+                        LOGGER.Warn("e.Data is: " & fmt + " (" +
-                              e.Data.GetData(fmt).ToString() + ")", True, False)
+                              e.Data.GetData(fmt).ToString() + ")", True)
                     Next
 
                 End If
@@ -102,7 +102,7 @@ Public Class ClassDragDrop
                     MsgBox("Unexpected error in Initialisieren von Outlook-API:" & vbNewLine & ex.Message & vbNewLine & vbNewLine & "Evtl ist Outlook nicht in der dafür vorgesehenen For")
                     Return False
                 End Try
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> Drop of msg", False)
+                LOGGER.Debug("Drop of msg")
                 'supports a drop of a Outlook message 
                 Dim myobj As Object
                 For i As Integer = 1 To oApp.ActiveExplorer.Selection.Count
@@ -123,7 +123,7 @@ Public Class ClassDragDrop
                     strFile = strFile.Replace("!", "")
                     strFile = strFile.Replace("%", "")
                     strFile = strFile.Replace("$", "")
-                    ClassLogger.Add(">> Drop of msg - File:" & strFile, False)
+                    LOGGER.Info("Drop of msg - File:" & strFile)
                     Try
                         myobj.SaveAs(strFile)
                     Catch ex As Exception
@@ -156,22 +156,22 @@ Public Class ClassDragDrop
             My.Settings.WD_INDEXDOKART_SAVE = ""
             If e.Data.GetDataPresent(DataFormats.FileDrop) Then
                 e.Effect = DragDropEffects.All
-                If LogErrorsOnly = True Then ClassLogger.Add("DragEnter ... SimpleFileDrop", False)
+                LOGGER.Debug("DragEnter ... SimpleFileDrop")
                 'frmForm_Constructor_Main_2.tslblStatusMain_show(True, "DragEnter ... SimpleFileDrop")
             ElseIf (e.Data.GetDataPresent("FileGroupDescriptor")) AndAlso (e.Data.GetDataPresent("FileContents")) Then
                 e.Effect = DragDropEffects.Copy
                 'frmForm_Constructor_Main_2.tslblStatusMain_show(True, "DragEnter ... Attachment from Outlook")
-                If LogErrorsOnly = True Then ClassLogger.Add("DragEnter ... Attachment from Outlook", False)
+                LOGGER.Debug("DragEnter ... Attachment from Outlook")
             ElseIf e.Data.GetDataPresent("FileGroupDescriptor") Then
                 'handle a message dragged from Outlook
                 e.Effect = DragDropEffects.Copy
                 'frmForm_Constructor_Main_2.tslblStatusMain_show(True, "DragEnter ... OutlookMessage")
-                If LogErrorsOnly = True Then ClassLogger.Add("DragEnter ... OutlookMessage", False)
+                LOGGER.Debug("DragEnter ... OutlookMessage")
             Else
                 'otherwise, do not handle
                 e.Effect = DragDropEffects.Copy
                 'frmForm_Constructor.tslblStatusMain_show(True, "DragEnter ... Other FileFormat")
-                If LogErrorsOnly = True Then ClassLogger.Add("DragEnter ... Other FileFormat", False)
+                LOGGER.Debug("DragEnter ... Other FileFormat")
             End If
         Catch ex As Exception
 

app/DD-Record-Organizer/ClassEmail.vb

@@ -63,17 +63,11 @@ Public Class ClassEmail
                                                "<br>>> Gesendet am: " & My.Computer.Clock.LocalTime.ToShortDateString & " " & _
                                                My.Computer.Clock.LocalTime.ToLongTimeString & "</font>")
                 ' create and add the attachment(s) */
-                Dim logfile = ClassLogger.logDateiname
-                If logfile Is Nothing Then
-                    MsgBox("Logging was not initiated", MsgBoxStyle.Exclamation)
-                    Return False
-                End If
 
-                If logfile.Contains("\\") Then
+
-                    logfile = logfile.Replace("\\", "\")
+
-                End If
+                If IO.File.Exists(LOGCONFIG.LogFile) Then
-                If IO.File.Exists(logfile) Then
+                    Dim Attachment As Attachment = New Attachment(LOGCONFIG.LogFile)
-                    Dim Attachment As Attachment = New Attachment(logfile)
                     message.Attachments.Add(Attachment)
                 End If
 
@@ -93,7 +87,7 @@ Public Class ClassEmail
                 '*Send the message */
                 emailClient.Send(message)
 
-                'ClassLogger.Add(">> Support/Log Email erfolgreich an " & _mailempfaenger & " versendet!", False)
+                'Logger.Warn("Support/Log Email erfolgreich an " & _mailempfaenger & " versendet!", False)
             Next
             Return True
         Catch ex As Exception

app/DD-Record-Organizer/ClassFileResult.vb

@@ -20,7 +20,7 @@
                 Return False
             End If
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in Set_InWork: " & ex.Message)
+            LOGGER.Warn("Unexpected Error in Set_InWork: " & ex.Message)
             Return False
         End Try
     End Function
@@ -37,7 +37,7 @@
                 Return False
             End If
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in Set_Displayname: " & ex.Message)
+            LOGGER.Warn("Unexpected Error in Set_Displayname: " & ex.Message)
             Return False
         End Try
     End Function
@@ -45,11 +45,11 @@
         Try
             Dim sql = String.Format("SELECT * FROM TBPMO_INDEX_MAN WHERE ACTIVE = 1 AND ENTITY_ID = (SELECT CASE REDUNDANT_ENTITY WHEN 0 THEN GUID ELSE REDUNDANT_ENTITY END AS ENTITY_ID  FROM TBPMO_FORM WHERE GUID = {0}) AND DOCTYPE_ID = {1}", CURRENT_ENTITY_ID, CURRENT_DOKARTID)
             Dim DT As DataTable = ClassDatabase.Return_Datatable(sql, True)
-            If LogErrorsOnly = False Then ClassLogger.Add(" >> GET_DATATABLE_INDICES_PMO: " & sql, False)
+            LOGGER.Debug("GET_DATATABLE_INDICES_PMO: " & sql, False)
             CURRENT_TBPMO_INDEX_MAN = DT
             Return True
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in GET_DATATABLE_INDICES_PMO: " & ex.Message)
+            LOGGER.Warn("Unexpected Error in GET_DATATABLE_INDICES_PMO: " & ex.Message)
             Return False
         End Try
     End Function
@@ -68,7 +68,7 @@
             End If
             Return True
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in SET_DOCID_INDICES: " & ex.Message)
+            LOGGER.Warn("Unexpected Error in SET_DOCID_INDICES: " & ex.Message)
             Return False
         End Try
     End Function
@@ -77,7 +77,7 @@
             Dim delete As String = String.Format("DELETE FROM TBPMO_DOC_INDICES WHERE DocID = {0}", DocID)
             Return ClassDatabase.Execute_non_Query(delete)
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in Update_Doc_Indices: " & ex.Message)
+            LOGGER.Warn("Unexpected Error in Update_Doc_Indices: " & ex.Message)
             Return False
         End Try
     End Function
@@ -94,7 +94,7 @@
                 Return False
             End If
         Catch ex As Exception
-            ClassLogger.Add(String.Format("Unexpected Error in Delete_ResultFile: ({0},{1},{2})", RESULT_DOC_ID, RECORD_ID, DELETE_FILE) & ex.Message)
+            LOGGER.Warn(String.Format("Unexpected Error in Delete_ResultFile: ({0},{1},{2})", RESULT_DOC_ID, RECORD_ID, DELETE_FILE) & ex.Message)
             MsgBox("Unexpected Error in Delete ResultFile:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
             Return False
         End Try
@@ -102,7 +102,7 @@
     Public Shared Function CheckWrite_IndexeMan(grbxControls As GroupBox)
         '#### Zuerst manuelle Werte indexieren ####
         Try
-            If LogErrorsOnly = False Then ClassLogger.Add(" >>In CheckWrite_IndexeMan", False)
+            LOGGER.Debug(" >>In CheckWrite_IndexeMan", False)
             Dim result As Boolean = False
             For Each ctrl As Control In grbxControls.Controls
                 '            ' MsgBox(ctrl.Name)
@@ -125,7 +125,7 @@
                         End If
                     Else
                         'If Indexwert_checkValueDB(Replace(box.Name, "txt", ""), box.Text) = False Then
-                        '    ClassLogger.Add(" - Der eingegebene Wert wurde nicht in der Datenbank gefunden", False)
+                        '    Logger.Warn(" - Der eingegebene Wert wurde nicht in der Datenbank gefunden", False)
                         '    MsgBox("Der eingegebene Wert wurde nicht in der Datenbank gefunden!", MsgBoxStyle.Exclamation, "Fehlerhafte Indexierung:")
                         '    box.Focus()
                         '    Return False
@@ -145,10 +145,10 @@
                             For Each row As DataRow In CURRENT_TBPMO_INDEX_MAN.Rows
                                 If row.Item("GUID") = btn.Tag Then
                                     If Not IsDBNull(row.Item("MAN_VALUE")) Then
-                                        If LogErrorsOnly = False Then ClassLogger.Add(" >> we got a value for folder...", False)
+                                        LOGGER.Debug("we got a value for folder...", False)
                                         result = True
                                     Else
-                                        If LogErrorsOnly = False Then ClassLogger.Add(" >> value for folder is missing...", False)
+                                        LOGGER.Debug("value for folder is missing...", False)
                                         MsgBox("Please choose a folder!", MsgBoxStyle.Exclamation, "Missing input:")
                                         Return False
                                     End If
@@ -157,7 +157,7 @@
 
                             Next
                         Else
-                            If LogErrorsOnly = False Then ClassLogger.Add(" >> value for folder is OPTIONAL...", False)
+                            LOGGER.Debug("value for folder is OPTIONAL...", False)
                             SET_CURRENT_TBPMO_INDEX_MAN_VALUE(btn.Tag, "")
                             result = True
                         End If
@@ -198,7 +198,7 @@
                     result = True
                 End If
                 If ctrl.Name.StartsWith("lbl") = False And result = False Then
-                    ClassLogger.Add("Die Überprüfung der manuellen Indices ist fehlerhaft. Bitte informieren Sie den Systembetreuer", True)
+                    LOGGER.Warn("Die Überprüfung der manuellen Indices ist fehlerhaft. Bitte informieren Sie den Systembetreuer", True)
                     Return False
                 End If
             Next
@@ -207,7 +207,7 @@
             Return True
 
         Catch ex As Exception
-            ClassLogger.Add(" - Unvorhergesehener Fehler in CheckWrite_IndexeMan - Fehler: " & vbNewLine & ex.Message)
+            LOGGER.Warn(" - Unvorhergesehener Fehler in CheckWrite_IndexeMan - Fehler: " & vbNewLine & ex.Message)
             MsgBox(ex.Message, MsgBoxStyle.Critical, "Unerwarteter Unexpected error in CheckWrite_IndexeMan:")
             Return False
         End Try
@@ -222,7 +222,7 @@
                 End If
             Next
         Catch ex As Exception
-            ClassLogger.Add(" - Unvorhergesehener Fehler in SET_CURRENT_TBPMO_INDEX_MAN_VALUE - Fehler: " & vbNewLine & ex.Message)
+            LOGGER.Warn(" - Unvorhergesehener Fehler in SET_CURRENT_TBPMO_INDEX_MAN_VALUE - Fehler: " & vbNewLine & ex.Message)
             Return Nothing
         End Try
     End Function

app/DD-Record-Organizer/ClassFolderWatcher.vb

@@ -15,7 +15,7 @@ Public Class ClassFolderWatcher
                 FWSCAN_started = False
                 'FolderWatch neu instanzieren
                 FolderWatcher_SCAN = New System.IO.FileSystemWatcher(CURRENT_SCAN_FOLDERWATCH, "*.*")
-                ClassLogger.Add(" >> FolderWatchScan neu instanziert", False)
+                LOGGER.Warn("FolderWatchScan neu instanziert")
                 FolderWatcher_SCAN.IncludeSubdirectories = CURRENT_SCAN_FOLDERWATCH_SD
                 FolderWatcher_SCAN.EnableRaisingEvents = True
                 AddHandler FolderWatcher_SCAN.Created, AddressOf OnCreated
@@ -36,7 +36,7 @@ Public Class ClassFolderWatcher
             End If
             If FolderWatcher_SCAN Is Nothing Then
                 FolderWatcher_SCAN = New System.IO.FileSystemWatcher(CURRENT_SCAN_FOLDERWATCH, "*.*")
-                ClassLogger.Add(" >> FolderWatch Scan Gestartet", False)
+                LOGGER.Info("FolderWatch Scan Gestartet")
                 FolderWatcher_SCAN.IncludeSubdirectories = CURRENT_SCAN_FOLDERWATCH_SD
                 FolderWatcher_SCAN.EnableRaisingEvents = True
                 AddHandler FolderWatcher_SCAN.Created, AddressOf OnCreated
@@ -48,7 +48,7 @@ Public Class ClassFolderWatcher
                 ' Dim watcher As New FileSystemWatcher()
                 ' watcher.Path = CURRENT_FOLDERWATCH
                 FolderWatcher_SCAN = New System.IO.FileSystemWatcher(CURRENT_SCAN_FOLDERWATCH, "*.*")
-                ClassLogger.Add(" >> FolderWatch Scan Gestartet", False)
+                LOGGER.Info("FolderWatch Scan Gestartet")
                 FolderWatcher_SCAN.IncludeSubdirectories = CURRENT_SCAN_FOLDERWATCH_SD
                 FolderWatcher_SCAN.EnableRaisingEvents = True
                 AddHandler FolderWatcher_SCAN.Created, AddressOf OnCreated
@@ -59,7 +59,7 @@ Public Class ClassFolderWatcher
                 'Gestartet also Stoppen
                 FolderWatcher_SCAN.EnableRaisingEvents = False
                 FWSCAN_started = False
-                ClassLogger.Add(" >> FolderWatch Scan gestoppt", False)
+                LOGGER.Info("FolderWatch Scan gestoppt")
                 SaveMySettingsValue("FWSCAN_started", "False", "ConfigMain")
                 Return 0
             End If
@@ -85,7 +85,7 @@ Public Class ClassFolderWatcher
                 handleType = "SCAN"
             End If
             'Die Datei übergeben
-            If LogErrorsOnly = False Then ClassLogger.Add(" >> OnCreated-File:" & e.FullPath, False)
+            LOGGER.Debug("OnCreated-File:" & e.FullPath)
             If FileExistsinDropTable(CURRENT_FILENAME) = False Then
                 Insert_USER_File(e.FullPath, handleType)
             Else

app/DD-Record-Organizer/ClassGridFormatter.vb

@@ -83,7 +83,7 @@ Public Class ClassGridFormatter
                 clonedDT.Load(DT.CreateDataReader)
                 Return clonedDT
             Catch ex As Exception
-                ClassLogger.Add("Unexpected Error in FormatDatatable: " & ex.Message, True)
+                LOGGER.Warn("Unexpected Error in FormatDatatable: " & ex.Message)
                 Return DT
             End Try
         End Function
@@ -153,7 +153,7 @@ Public Class ClassGridFormatter
                 Dim list As New List(Of String)
                 ' Alle Currency Felder für aktuelle Ansicht heraussuchen
                 Dim sql As String = "SELECT COL_NAME FROM TBPMO_CONTROL WHERE CONTROL_TYPE_ID = 2 AND FORMAT_TYPE = 'Currency' AND SHOW_COLUMN = 1 AND FORM_ID = " & Me.EntityId
-                Dim dt As DataTable = ClassHelper.FILTER_DATATABLE(CURRENT_TBPMO_CONTROL, "CONTROL_TYPE_ID = 2 AND FORMAT_TYPE = 'Currency' AND SHOW_COLUMN = 1 AND FORM_ID = " & Me.EntityId, "") 'ClassDatabase.Return_Datatable(sql, True)
+                Dim dt As DataTable = ClassHelper.FILTER_DATATABLE(CURRENT_TBPMO_CONTROL, "CONTROL_TYPE_ID = 2 AND FORMAT_TYPE = 'Currency' AND SHOW_COLUMN = 1 AND FORM_ID = " & Me.EntityId, "")
 
                 For Each row As DataRow In dt.Rows
                     list.Add(row.Item("COL_NAME"))
@@ -161,7 +161,7 @@ Public Class ClassGridFormatter
 
                 Return list
             Catch ex As Exception
-                ClassLogger.Add("Unexpected Error in GetCurrencyColumns: " & ex.Message, True)
+                LOGGER.Warn("Unexpected Error in GetCurrencyColumns: " & ex.Message)
                 Return Nothing
             End Try
         End Function
@@ -171,7 +171,7 @@ Public Class ClassGridFormatter
                 Dim listcheck As New List(Of String)
                 ' Alle Checkboxen für aktuelle Ansicht heraussuchen
                 ' Dim sqlcheck As String = "SELECT COL_NAME FROM TBPMO_CONTROL WHERE CONTROL_TYPE_ID in (10,11) AND SHOW_COLUMN = 1 AND FORM_ID = " & Me.EntityId
-                Dim dtcheck As DataTable = ClassHelper.FILTER_DATATABLE(CURRENT_TBPMO_CONTROL, "CONTROL_TYPE_ID in (10,11) AND SHOW_COLUMN = 1 AND FORM_ID = " & Me.EntityId, "") ' ClassDatabase.Return_Datatable(sqlcheck, True)
+                Dim dtcheck As DataTable = ClassHelper.FILTER_DATATABLE(CURRENT_TBPMO_CONTROL, "CONTROL_TYPE_ID in (10,11) AND SHOW_COLUMN = 1 AND FORM_ID = " & Me.EntityId, "")
                 'Liste von allen Spaltentiteln mit Checkbox erstellen
                 If dtcheck.Rows.Count > 0 Then
                     For Each row As DataRow In dtcheck.Rows
@@ -181,7 +181,7 @@ Public Class ClassGridFormatter
                 listcheck.Add("files?")
                 Return listcheck
             Catch ex As Exception
-                ClassLogger.Add("Unexpected Error in GetCheckboxColumns: " & ex.Message, True)
+                LOGGER.Warn("Unexpected Error in GetCheckboxColumns: " & ex.Message)
                 Return Nothing
             End Try
         End Function
@@ -190,7 +190,7 @@ Public Class ClassGridFormatter
                 Dim listdate As New List(Of String)
                 ' Alle Checkboxen für aktuelle Ansicht heraussuchen
                 ' Dim sqlcheck As String = "SELECT COL_NAME FROM TBPMO_CONTROL WHERE CONTROL_TYPE_ID = 4 AND SHOW_COLUMN = 1 AND FORM_ID = " & Me.EntityId
-                Dim dtdate As DataTable = ClassHelper.FILTER_DATATABLE(CURRENT_TBPMO_CONTROL, "CONTROL_TYPE_ID = 4 AND SHOW_COLUMN = 1 AND FORM_ID = " & Me.EntityId, "") 'ClassDatabase.Return_Datatable(sqlcheck, True)
+                Dim dtdate As DataTable = ClassHelper.FILTER_DATATABLE(CURRENT_TBPMO_CONTROL, "CONTROL_TYPE_ID = 4 AND SHOW_COLUMN = 1 AND FORM_ID = " & Me.EntityId, "")
 
                 'Liste von allen Spaltentiteln mit Checkbox erstellen
                 If dtdate.Rows.Count > 0 Then
@@ -200,7 +200,7 @@ Public Class ClassGridFormatter
                 End If
                 Return listdate
             Catch ex As Exception
-                ClassLogger.Add("Unexpected Error in GetCheckboxColumns: " & ex.Message, True)
+                LOGGER.Warn("Unexpected Error in GetCheckboxColumns: " & ex.Message)
                 Return Nothing
             End Try
         End Function
@@ -248,7 +248,7 @@ End Class
 '            tbltemp.Load(Primary_DT.CreateDataReader)
 '            Return tbltemp
 '        Catch ex As Exception
-'            ClassLogger.Add(">> Attention: Format_GridColumns - Could not load converted datatable: " & ex.Message, False)
+'            Logger.Warn("Attention: Format_GridColumns - Could not load converted datatable: " & ex.Message)
 '            'Tabelle wird ohne Datekonvertierung geladen
 '            Dim DTEntity As DataTable = ClassDatabase.Return_Datatable(_ENTITYSQL, "Load_Entity_Data_Only")
 '            Dim primaryKey(1) As DataColumn
@@ -258,7 +258,7 @@ End Class
 '        End Try
 '    Catch ex As Exception
 '        MsgBox("Unexpected Error in Format_GridColumns:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-'        ClassLogger.Add("Error in Format_GridColumns: " & ex.Message, True)
+'        Logger.Warn("Error in Format_GridColumns: " & ex.Message)
 '        Return Nothing
 '    End Try
 

app/DD-Record-Organizer/ClassHelper.vb

@@ -18,7 +18,7 @@ Public Class ClassHelper
                     ochanged = True
                 End If
             End If
-            If LogErrorsOnly = False And ochanged = True Then ClassLogger.Add(" >> WMpath is: " & WMpath, False)
+            LOGGER.Debug("WMpath is: " & WMpath)
             Return WMpath
         Catch ex As Exception
             Return WMpath
@@ -53,7 +53,7 @@ Public Class ClassHelper
             Dim result = dt.ToString(format, CultureInfo.InvariantCulture)
             Return result
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error while converting value '" & input & "' to date....." & ex.Message, False)
+            LOGGER.Warn("Unexpected Error while converting value '" & input & "' to date....." & ex.Message)
             Return input
         End Try
 
@@ -79,7 +79,7 @@ Public Class ClassHelper
             Dim result = dt.ToString("yyyy-MM-dd", Nothing)
             Return result
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error while converting value '" & input & "' to date(Convert_to_Database_Date)....." & ex.Message, False)
+            LOGGER.Warn("Unexpected Error while converting value '" & input & "' to date(Convert_to_Database_Date)....." & ex.Message)
             Return input
         End Try
 
@@ -110,7 +110,7 @@ Public Class ClassHelper
             Try
                 FileOpen(fs, filename, OpenMode.Binary, OpenAccess.ReadWrite, OpenShare.LockReadWrite)
             Catch ex As Exception
-                ClassLogger.Add("File " & filename & " inuse or not able to open - message: " & ex.Message, True)
+                LOGGER.Warn("File " & filename & " inuse or not able to open - message: " & ex.Message)
                 inuse = True
             Finally
                 FileClose(fs)
@@ -141,17 +141,11 @@ Public Class ClassHelper
             End If
             Return _NewFileString & extension
         Catch ex As Exception
-            ClassLogger.Add(" - Error in versioning file - error: " & vbNewLine & ex.Message)
+            LOGGER.Warn(" - Error in versioning file - error: " & vbNewLine & ex.Message)
             MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in versioning file:")
             Return ""
         End Try
     End Function
-    '' <summary>
-    ''' Ersetzt alle nicht zulässigen Zeichen im angegebenen Dateinamen
-    ''' </summary>
-    ''' <param name="sFilename">Dateiname ohne Pfadangabe</param>
-    ''' <param name="sChar">Ersatzzeichen für alle unzulässigen Zeichen 
-    ''' im Dateinamen</param>
     Public Shared Function CleanFilename(ByVal sFilename As String,
       Optional ByVal REPLACEChar As String = "") As String
 
@@ -187,11 +181,11 @@ Public Class ClassHelper
             Else
                 MSGBOX_Handler("ERROR", "", "Sorry, but the docpath for doc-id: " & DocID & " is nothing!")
                 Return False
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> RESULT_DOC_PATH IS NOTHING")
+                LOGGER.Debug("RESULT_DOC_PATH IS NOTHING")
             End If
         Catch ex As Exception
             MsgBox("Unexpected Error in File_open:" & vbNewLine & ex.Message & vbNewLine & RESULT_DOC_PATH & vbNewLine & "DocID: " & DocID, MsgBoxStyle.Critical)
-            ClassLogger.Add("Error in File_open: " & ex.Message & vbNewLine & " - Path: " & RESULT_DOC_PATH & " - DocID: " & DocID, True)
+            LOGGER.Warn("Error in File_open: " & ex.Message & vbNewLine & " - Path: " & RESULT_DOC_PATH & " - DocID: " & DocID)
             Return False
         End Try
     End Function
@@ -201,11 +195,11 @@ Public Class ClassHelper
                 Dim _path = Path.GetDirectoryName(RESULT_DOC_PATH)
                 FOLDER_OPEN(_path, DocID)
             Else
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> RESULT_DOC_PATH IS NOTHING")
+                LOGGER.Debug("RESULT_DOC_PATH IS NOTHING")
             End If
         Catch ex As Exception
             MsgBox("Unexpected Error in Open_Folder:" & vbNewLine & ex.Message & vbNewLine & RESULT_DOC_PATH & vbNewLine & "DocID: " & DocID, MsgBoxStyle.Critical)
-            ClassLogger.Add("Error in Open_Folder: " & ex.Message & vbNewLine & " - Path: " & RESULT_DOC_PATH & " - DocID: " & DocID, True)
+            LOGGER.Warn("Error in Open_Folder: " & ex.Message & vbNewLine & " - Path: " & RESULT_DOC_PATH & " - DocID: " & DocID)
         End Try
     End Sub
     Public Shared Sub OPEN_DOCVIEW(Doc_Path As String, DocID As Integer)
@@ -220,7 +214,7 @@ Public Class ClassHelper
             CURRENT_DOCVIEW = DocView
         Catch ex As Exception
             MsgBox("Unexpected Error in DocView Open:" & vbNewLine & ex.Message & vbNewLine & Doc_Path & vbNewLine & "DocID: " & DocID, MsgBoxStyle.Critical)
-            ClassLogger.Add("Error in DocView Open: " & ex.Message & vbNewLine & " - Path: " & Doc_Path & " - DocID: " & DocID, True)
+            LOGGER.Warn("Error in DocView Open: " & ex.Message & vbNewLine & " - Path: " & Doc_Path & " - DocID: " & DocID)
             File_SYSOPEN(Doc_Path, DocID)
         End Try
     End Sub
@@ -238,7 +232,7 @@ Public Class ClassHelper
             End If
         Catch ex As Exception
             MsgBox("Unexpected Error in File_SYSOPEN:" & vbNewLine & ex.Message & vbNewLine & RESULT_DOC_PATH & vbNewLine & "DocID: " & DocID, MsgBoxStyle.Critical)
-            ClassLogger.Add("Error in File_SYSOPEN: " & ex.Message & vbNewLine & " - Path: " & RESULT_DOC_PATH & " - DocID: " & DocID, True)
+            LOGGER.Warn("Error in File_SYSOPEN: " & ex.Message & vbNewLine & " - Path: " & RESULT_DOC_PATH & " - DocID: " & DocID)
         End Try
 
     End Sub
@@ -256,7 +250,7 @@ Public Class ClassHelper
                 oMyProcess.Start()
                 Dim ProcID = oMyProcess.GetCurrentProcess.Id
                 oExtension = Path.GetExtension(BW_DocPath).ToLower
-                If LogErrorsOnly = False Then ClassLogger.Add($"Checking oExtension [{oExtension}]...", False)
+                LOGGER.Debug($"Checking oExtension [{oExtension}]...")
                 If FILE_FORMATS_CHANGE_DURING_EDIT.Contains(oExtension) Then
                     oSql = $"SELECT dwVersionID FROM VWPMO_DOC_SEARCH WHERE DocID = {BW_DocID}"
                     Dim odwVersionId = clsDatabase.Execute_Scalar(oSql, False)
@@ -267,23 +261,23 @@ Public Class ClassHelper
 
                 'oMyProcess.WaitForExit()
             Catch ex As Exception
-                ClassLogger.Add("Error in Process1.Start(): " & ex.Message & vbNewLine & " - Path: " & BW_DocPath & " - DocID: " & BW_DocID, True)
+                LOGGER.Warn("Error in Process1.Start(): " & ex.Message & vbNewLine & " - Path: " & BW_DocPath & " - DocID: " & BW_DocID)
                 Exit Sub
             End Try
 
         Catch ex As Exception
-            ClassLogger.Add("Error in Process.Start(): " & ex.Message & vbNewLine & " - Path: " & BW_DocPath & " - DocID: " & BW_DocID, True)
+            LOGGER.Warn("Error in Process.Start(): " & ex.Message & vbNewLine & " - Path: " & BW_DocPath & " - DocID: " & BW_DocID)
             Try
                 Process.Start(BW_DocPath)
             Catch ex1 As Exception
-                ClassLogger.Add("Error in Process.Start(1): " & ex1.Message & vbNewLine & " - Path: " & BW_DocPath & " - DocID: " & BW_DocID, True)
+                LOGGER.Warn("Error in Process.Start(1): " & ex1.Message & vbNewLine & " - Path: " & BW_DocPath & " - DocID: " & BW_DocID)
             End Try
         End Try
     End Sub
     Private Shared Sub FOLDER_OPEN(PATH As Object, DocID As String)
         Try
             If PATH <> Nothing Then
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> in FOLDER_OPEN(" & PATH & ")", False)
+                LOGGER.Debug("in FOLDER_OPEN(" & PATH & ")")
                 If System.IO.Directory.Exists(PATH) = True Then
                     Process.Start(PATH)
                 Else
@@ -292,7 +286,7 @@ Public Class ClassHelper
             End If
         Catch ex As Exception
             MsgBox("Unexpected Error in FOLDER_OPEN:" & vbNewLine & ex.Message & vbNewLine & PATH & vbNewLine & "DocID: " & DocID, MsgBoxStyle.Critical)
-            ClassLogger.Add("Error in FOLDER_OPEN: " & ex.Message & vbNewLine & " - Path: " & PATH & " - DocID: " & DocID, True)
+            LOGGER.Warn("Error in FOLDER_OPEN: " & ex.Message & vbNewLine & " - Path: " & PATH & " - DocID: " & DocID)
         End Try
 
     End Sub
@@ -307,7 +301,7 @@ Public Class ClassHelper
             Dim result = clsDatabase.Execute_non_Query(insert, False)
             Return result
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in InsertEssential_Log: " & ex.Message, True, False)
+            LOGGER.Warn("Unexpected Error in InsertEssential_Log: " & ex.Message)
             Return False
         End Try
     End Function
@@ -324,10 +318,10 @@ Public Class ClassHelper
             Else
                 ClassProxy.PRPROXY_RECORD_DEL(SELECTED_RECORD_ID, CURRENT_ENTITY_ID)
             End If
-
+            LOGGER.Info($"Deleted Record [{SELECTED_RECORD_ID}] Result was [{result}]: ")
             Return result
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in DeleteRecord: " & ex.Message, True)
+            LOGGER.Warn("Unexpected Error in DeleteRecord: " & ex.Message)
             Return False
         End Try
     End Function
@@ -338,7 +332,7 @@ Public Class ClassHelper
         End If
         If type = "ERROR" Then
             MessageBox.Show(msg, Caption, MessageBoxButtons.OK, MessageBoxIcon.Error)
-            ClassLogger.Add(msg, True)
+            LOGGER.Warn(msg)
         ElseIf type = "INFO" Then
             MessageBox.Show(msg, Caption, MessageBoxButtons.OK, MessageBoxIcon.Information)
         End If
@@ -354,10 +348,10 @@ Public Class ClassHelper
             sql = sql.Replace("@ENTITY_ID", ENTITY_ID)
             sql = sql.Replace("@USERNAME", USER_USERNAME)
             sql = sql.Replace("@USER_NAME", USER_USERNAME)
-            If LogErrorsOnly = False Then ClassLogger.Add(" >> RIGHT_ONLY_READ_RECORD_DOC SQL: (When true then disable) '" & sql & "'", False)
+            LOGGER.Debug("RIGHT_ONLY_READ_RECORD_DOC SQL: (When true then disable) '" & sql & "'")
             Return CBool(ClassDatabase.Execute_Scalar(sql, True))
         Catch ex As Exception
-            ClassLogger.Add(">> SQL_RIGHT_READ_AND_VIEW_ONLY: " & sql)
+            LOGGER.Warn("SQL_RIGHT_READ_AND_VIEW_ONLY: " & sql)
             Return False
         End Try
     End Function
@@ -373,10 +367,10 @@ Public Class ClassHelper
             sql = sql.Replace("@ENTITY_ID", ENTITY_ID)
             sql = sql.Replace("@USERNAME", USER_USERNAME)
             sql = sql.Replace("@USER_NAME", USER_USERNAME)
-            If LogErrorsOnly = False Then ClassLogger.Add(" >> RIGHT_ONLY_READ_COC SQL: (When true then disable) '" & sql & "'", False)
+            LOGGER.Debug("RIGHT_ONLY_READ_COC SQL: (When true then disable) '" & sql & "'")
             Return CBool(ClassDatabase.Execute_Scalar(sql, True))
         Catch ex As Exception
-            ClassLogger.Add(">> RIGHT_WINDREAM_FORBIDDEN: " & sql)
+            LOGGER.Warn("RIGHT_WINDREAM_FORBIDDEN: " & sql)
             Return False
         End Try
     End Function
@@ -405,7 +399,7 @@ Public Class ClassHelper
             result = wrapper.DecryptData(ciphertext)
             Return result
         Catch ex As Exception
-            ClassLogger.Add("The ciphertext for Method'" & MethodName & "' could not be decrypted", False)
+            LOGGER.Warn("The ciphertext for Method'" & MethodName & "' could not be decrypted")
             Return ""
         End Try
     End Function
@@ -419,7 +413,7 @@ Public Class ClassHelper
             'Dim filteredData = BaseDatatable.Select(expression).CopyToDataTable()
             Return filteredData
         Catch ex As Exception
-            ClassLogger.Add("unexpected error in FILTER_DATATABLE: " & ex.Message)
+            LOGGER.Warn("unexpected error in FILTER_DATATABLE: " & ex.Message)
             Return Nothing
         End Try
 

app/DD-Record-Organizer/ClassImport_Windream.vb

@@ -42,7 +42,7 @@ Public Class ClassImport_Windream
                                             idxvalue = idxvalue.ToString.Replace("@Dokart", Dokart)
                                     End Select
                                 End If
-                                If LogErrorsOnly = False Then ClassLogger.Add(" >> Indexvalue: " & idxvalue.ToString, False)
+                                LOGGER.Debug("Indexvalue: " & idxvalue.ToString)
                                 Count += 1
                                 indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, idxvalue, clsWindream.MY_WDOBJECTTYPE)
                                 If indexierung_erfolgreich = False Then
@@ -62,7 +62,7 @@ Public Class ClassImport_Windream
                             '    If dt.Rows.Count = 1 Then
                             '        Dim indexname = dt.Rows(0).Item("IDXNAME_ENTITYID").ToString
                             '        Dim idxvalue = CURRENT_ENTITY_ID
-                            '        If LogErrorsOnly = False Then ClassLogger.Add(" >> Entity-ID: " & idxvalue.ToString, False)
+                            '        LOGGER.Debug("Entity-ID: " & idxvalue.ToString)
                             '        indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, idxvalue, clsWindream.MY_WDOBJECTTYPE)
                             '        If indexierung_erfolgreich = False Then
                             '            err = True
@@ -71,7 +71,7 @@ Public Class ClassImport_Windream
                             '        End If
                             '        indexname = dt.Rows(0).Item("IDXNAME_PARENTID").ToString
                             '        idxvalue = CURRENT_PARENT_ENTITY_ID
-                            '        If LogErrorsOnly = False Then ClassLogger.Add(" >> Parent-ID: " & idxvalue.ToString, False)
+                            '        LOGGER.Debug("Parent-ID: " & idxvalue.ToString)
                             '        indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, idxvalue, clsWindream.MY_WDOBJECTTYPE)
                             '        If indexierung_erfolgreich = False Then
                             '            err = True
@@ -135,7 +135,7 @@ Public Class ClassImport_Windream
                 oROOTWM_FOLDER = ""
             End Try
             If oROOTWM_FOLDER <> String.Empty Then
-                If LogErrorsOnly = False Then ClassLogger.Add($">> oROOTWM_FOLDER '{oROOTWM_FOLDER}' will be used", False)
+                LOGGER.Debug($"oROOTWM_FOLDER '{oROOTWM_FOLDER}' will be used")
                 oWMTARGET_FOLDER = oROOTWM_FOLDER
             End If
 
@@ -143,11 +143,11 @@ Public Class ClassImport_Windream
             If Not IsDBNull(oDYNAMIC_FOLDER) Then
                 If oDYNAMIC_FOLDER <> String.Empty Then
                     If CREATE_FOLDER_INDEX(oDYNAMIC_FOLDER, DocTypeID) = True And CURRENT_VARIABLE_FOLDER <> "" Then
-                        If LogErrorsOnly = False Then
+
-                            ClassLogger.Add(" >> After CREATE_FOLDER_INDEX - oWMTARGET_FOLDER: " & oWMTARGET_FOLDER, False)
+                        LOGGER.Debug("After CREATE_FOLDER_INDEX - oWMTARGET_FOLDER: " & oWMTARGET_FOLDER)
-                            ClassLogger.Add(" >> After CREATE_FOLDER_INDEX - CURRENT_VARIABLE_FOLDER: " & CURRENT_VARIABLE_FOLDER, False)
+                            LOGGER.Debug("After CREATE_FOLDER_INDEX - CURRENT_VARIABLE_FOLDER: " & CURRENT_VARIABLE_FOLDER)
-                        End If
+
-                        If oWMTARGET_FOLDER <> CURRENT_VARIABLE_FOLDER Then
+                            If oWMTARGET_FOLDER <> CURRENT_VARIABLE_FOLDER Then
                             oWMTARGET_FOLDER = oWMTARGET_FOLDER & "\" & CURRENT_VARIABLE_FOLDER.Replace(oWMTARGET_FOLDER, "")
                         Else
                             oWMTARGET_FOLDER = CURRENT_VARIABLE_FOLDER
@@ -161,10 +161,10 @@ Public Class ClassImport_Windream
                     End If
                 End If
             End If
-            If LogErrorsOnly = False Then
+
-                ClassLogger.Add(" >> oWMTARGET_FOLDER: " & oWMTARGET_FOLDER, False)
+            LOGGER.Debug("oWMTARGET_FOLDER: " & oWMTARGET_FOLDER)
-                ClassLogger.Add(" >> CURRENT_SUBFOLDER: " & CURRENT_SUBFOLDER, False)
+                LOGGER.Debug("CURRENT_SUBFOLDER: " & CURRENT_SUBFOLDER)
-            End If
+
 
             'Untsserordner ja oder nein
             If CURRENT_CHECK_SUBFOLDER = True And CURRENT_SUBFOLDER <> "" Then
@@ -172,7 +172,7 @@ Public Class ClassImport_Windream
             End If
             oWMTARGET_FOLDER = oWMTARGET_FOLDER.Replace("\\", "\")
             If oWMTARGET_FOLDER.Contains("/") Then
-                ClassLogger.Add(String.Format(">> Targetpath contains /-sign. / will be replaced with _"))
+                LOGGER.Info(String.Format("Targetpath contains /-sign. / will be replaced with _"))
                 oWMTARGET_FOLDER = oWMTARGET_FOLDER.Replace("/", "_")
             End If
 
@@ -180,7 +180,7 @@ Public Class ClassImport_Windream
             Try
                 Select Case clsWD_GET.WD_PATH_EXISTS(oWMTARGET_FOLDER.Substring(2))
                     Case False
-                        ClassLogger.Add(String.Format(">> Targetpath ({0}) is not existing or result of WD_PATH_EXISTS was false.", oWMTARGET_FOLDER.Substring(2)), False)
+                        LOGGER.Info(String.Format("Targetpath ({0}) is not existing or result of WD_PATH_EXISTS was false.", oWMTARGET_FOLDER.Substring(2)))
                         Dim split() As String = oWMTARGET_FOLDER.Split("\")
                         Dim Path_Combined As String = ""
                         For Each s As String In split
@@ -194,18 +194,18 @@ Public Class ClassImport_Windream
 
                                     Select Case clsWD_GET.WD_PATH_EXISTS(temppath)
                                         Case False
-                                            If LogErrorsOnly = False Then
+
-                                                ClassLogger.Add(" >> Trying to create folder-part: " & temppath, False)
+                                            LOGGER.Debug("Trying to create folder-part: " & temppath)
-                                            End If
+
                                             clsWindream.MY_WDSESSION.GetNewWMObjectFS(2, temppath, 0) 'WMEntityFolder,WMObjectEditModeNoEdit)
                                         Case -10
-                                            ClassLogger.Add(">> WD_PATH_EXISTS returned -10 for: " & temppath, False)
+                                            LOGGER.Warn("WD_PATH_EXISTS returned -10 for: " & temppath)
                                             Return False
                                     End Select
                                 Catch ex As Exception
                                     If Not ex.Message.Contains("Filename exists!") Then
-                                        ClassLogger.Add(String.Format(">> Could not create folder-part: {0} - Complete path is: ({1})", temppath, oWMTARGET_FOLDER.Substring(2)))
+                                        LOGGER.Warn(String.Format("Could not create folder-part: {0} - Complete path is: ({1})", temppath, oWMTARGET_FOLDER.Substring(2)))
-                                        ClassLogger.Add(String.Format(">> ErrorMessage: {0}: ", ex.Message))
+                                        LOGGER.Warn(String.Format("ErrorMessage: {0}: ", ex.Message))
                                         Return False
                                     End If
                                 End Try
@@ -217,7 +217,7 @@ Public Class ClassImport_Windream
                 End Select
             Catch ex As Exception
                 If Not ex.Message.Contains("Filename exists!") Then
-                    ClassLogger.Add(String.Format(">> Could not create folder ({0}): " & ex.Message, oWMTARGET_FOLDER.Substring(2)), False)
+                    LOGGER.Warn(String.Format("Could not create folder ({0}): " & ex.Message, oWMTARGET_FOLDER.Substring(2)))
                     Return False
                 End If
             End Try
@@ -227,15 +227,15 @@ Public Class ClassImport_Windream
             'Namenkonvention laden
             'Dim NameConv = ClassDatabase.Execute_Scalar("SELECT TOP 1 NAME_CONVENTION FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE DOCTYPE_ID = " & DocTypeID & " AND FORMVIEW_ID = " & CURRENT_FORMVIEW_ID, True)
             If IsDBNull(oNAME_CONVENTION) Then
-                ClassLogger.Add(">> Achtung: Namenskonvention is DBNull", False)
+                LOGGER.Warn("Achtung: Namenskonvention is DBNull")
                 oNAME_CONVENTION = Path.GetFileNameWithoutExtension(CURRENT_FILENAME)
             ElseIf oNAME_CONVENTION = String.Empty Then
-                ClassLogger.Add(">> Achtung: Namenskonvention is String empty", False)
+                LOGGER.Warn("Achtung: Namenskonvention is String empty")
                 oNAME_CONVENTION = Path.GetFileNameWithoutExtension(CURRENT_FILENAME)
             End If
             'schonmal den gesamten Pfad laden
             Dim oNewWM_Filename As String = oWMTARGET_FOLDER & "\" & oNAME_CONVENTION
-            If LogErrorsOnly = False Then ClassLogger.Add(" >> oNewWM_Filename: " & oNewWM_Filename, False)
+            LOGGER.Debug("oNewWM_Filename: " & oNewWM_Filename)
 
             ' einen Regulären Ausdruck laden
             Dim regulärerAusdruck As System.Text.RegularExpressions.Regex = New System.Text.RegularExpressions.Regex(preg)
@@ -245,7 +245,7 @@ Public Class ClassImport_Windream
             ' alle Vorkommen innerhalbd er Namenkonvention durchlaufen
             For Each element As System.Text.RegularExpressions.Match In elemente
 
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> element in RegeX: " & element.Value, False)
+                LOGGER.Debug("element in RegeX: " & element.Value)
                 Select Case element.Value.Substring(2, 1).ToUpper
                     'Nur automatische Indizes auswerten
                     Case "A"
@@ -269,7 +269,7 @@ Public Class ClassImport_Windream
                                         If IsNumeric(INDEX_ID) Then
                                             Dim sql_AUTOindexresult = ClassDatabase.Execute_Scalar("SELECT SQL_RESULT FROM TBDD_INDEX_AUTOM WHERE GUID = " & INDEX_ID, True)
                                             If IsNothing(sql_AUTOindexresult) Then
-                                                If LogErrorsOnly = False Then ClassLogger.Add(" >> unexpected: sql_AUTOindexresult is nothing!!", False)
+                                                LOGGER.Debug("unexpected: sql_AUTOindexresult is nothing!!")
                                                 value = ""
                                             Else
                                                 If IsDBNull(sql_AUTOindexresult) Then
@@ -278,8 +278,8 @@ Public Class ClassImport_Windream
                                                     sql_AUTOindexresult = sql_AUTOindexresult.ToString.ToUpper.Replace("@RECORD-ID", CURRENT_RECORD_ID)
                                                     Dim AUTOindexresult = ClassDatabase.Execute_Scalar(sql_AUTOindexresult, True)
                                                     If IsNothing(AUTOindexresult) Then
-                                                        ClassLogger.Add(">> ATTENTION: unexpected: AUTOindexresult is nothing!!", False)
+                                                        LOGGER.Warn("ATTENTION: unexpected: AUTOindexresult is nothing!!")
-                                                        ClassLogger.Add(">> " & sql_AUTOindexresult, False)
+                                                        LOGGER.Warn("" & sql_AUTOindexresult)
                                                         value = ""
                                                     Else
                                                         If IsDBNull(AUTOindexresult) Then
@@ -292,16 +292,16 @@ Public Class ClassImport_Windream
                                                 End If
                                             End If
                                         Else
-                                            ClassLogger.Add(">> INDEX_ID is not numeric:  " & INDEX_ID.ToString & "- APattern: " & APattern, False)
+                                            LOGGER.Warn("INDEX_ID is not numeric:  " & INDEX_ID.ToString & "- APattern: " & APattern)
                                             value = ""
                                         End If
                                     Else
-                                        ClassLogger.Add(">> split.Length <> 2 - APattern: " & APattern, False)
+                                        LOGGER.Warn("split.Length <> 2 - APattern: " & APattern)
                                         value = ""
                                     End If
 
                                 ElseIf APattern.Contains("#") Then
-                                    If LogErrorsOnly = False Then ClassLogger.Add(" >> element [" & APattern & "] filled with Record-Data...: ", False)
+                                    LOGGER.Debug("element [" & APattern & "] filled with Record-Data...: ")
                                     Dim split() As String = APattern.Split("#")
                                     If split.Length = 2 Then
                                         Dim CONTROL_ID = split(1)
@@ -316,24 +316,24 @@ Public Class ClassImport_Windream
                                                     lblsql = lblsql.ToString.ToUpper.Replace("@RECORD-ID", CURRENT_RECORD_ID)
                                                     lblsql = lblsql.ToString.ToUpper.Replace("@ENTITY-ID", CURRENT_ENTITY_ID)
                                                     lblsql = lblsql.ToString.ToUpper.Replace("@ENTITY_ID", CURRENT_ENTITY_ID)
-                                                    If LogErrorsOnly = False Then ClassLogger.Add(" >> variable sql will be used for convention", False)
+                                                    LOGGER.Debug("variable sql will be used for convention")
                                                     Dim result = ClassDatabase.Execute_ScalarWithConnection(DTtype.Rows(0).Item(2), lblsql)
                                                     If Not IsNothing(result) Then
                                                         value = result.ToString
                                                     Else
-                                                        ClassLogger.Add(">> variable sqlresult is nothing - " & lblsql, False)
+                                                        LOGGER.Warn("variable sqlresult is nothing - " & lblsql)
                                                         value = ""
                                                     End If
                                                 Else
-                                                    ClassLogger.Add(">> NameConvention should be filled with value of Control-ID '" & CONTROL_ID & "', but result was nothing.", False)
+                                                    LOGGER.Warn("NameConvention should be filled with value of Control-ID '" & CONTROL_ID & "', but result was nothing.")
-                                                    ClassLogger.Add(">> SQL-Command: " & CURRENT_LAST_SQL)
+                                                    LOGGER.Warn("SQL-Command: " & CURRENT_LAST_SQL)
                                                     value = ""
                                                 End If
 
                                             Else
                                                 If IsDBNull(CONTROLVALUE) Then
-                                                    ClassLogger.Add(">> NameConvention should be filled with value of Control-ID '" & CONTROL_ID & "', but result was DBNULL.", False)
+                                                    LOGGER.Warn("NameConvention should be filled with value of Control-ID '" & CONTROL_ID & "', but result was DBNULL.")
-                                                    ClassLogger.Add(">> SQL-Command: " & CURRENT_LAST_SQL)
+                                                    LOGGER.Warn("SQL-Command: " & CURRENT_LAST_SQL)
                                                     value = ""
                                                 Else
                                                     Dim sql1 = "SELECT * FROM TBPMO_WD_NAMECONVENTION_FORMAT WHERE ID = (SELECT TOP 1 GUID FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE DOCTYPE_ID = " & DocTypeID & " AND FORMVIEW_ID = " & CURRENT_FORMVIEW_ID & ")"
@@ -378,7 +378,7 @@ Public Class ClassImport_Windream
                         If value <> String.Empty Then
                             oNewWM_Filename = oNewWM_Filename.Replace(element.Value, value)
                             _NewFileString = oNewWM_Filename
-                            If LogErrorsOnly = False Then ClassLogger.Add(" >> Actual NEWFILESTRING: " & _NewFileString, False)
+                            LOGGER.Debug("Actual NEWFILESTRING: " & _NewFileString)
                             ' sql_history_INSERT_INTO = sql_history_INSERT_INTO & ", INDEX" & AnzahlIndexe.ToString
                             AnzahlIndexe += 1
                             ' sql_history_Index_Values = sql_history_Index_Values & ", '" & value & "'"
@@ -444,7 +444,7 @@ Public Class ClassImport_Windream
                             msg = "In nameconvention an element was defined which could not be replaced." & vbNewLine & "elementname: " & element.Value.ToUpper
                         End If
 
-                        ClassLogger.Add(msg)
+                        LOGGER.Warn(msg)
                         MsgBox(msg, MsgBoxStyle.Exclamation, "Error in Name Convention:")
                 End Select
             Next
@@ -452,11 +452,11 @@ Public Class ClassImport_Windream
                 'ungültige Zeichen entfernen
                 oNewWM_Filename = ClassHelper.CleanFilename(oNewWM_Filename, "")
                 If oNewWM_Filename.Contains("/") Then
-                    ClassLogger.Add(String.Format(">> DATEINAME contains /-sign. / will be replaced with _"))
+                    LOGGER.Info(String.Format("DATEINAME contains /-sign. / will be replaced with _"))
                     oNewWM_Filename = oNewWM_Filename.Replace("/", "_")
                 End If
             Catch ex As Exception
-                ClassLogger.Add(" - Error in Versioning file - Error: " & vbNewLine & ex.Message)
+                LOGGER.Warn(" - Error in Versioning file - Error: " & vbNewLine & ex.Message)
                 MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in Versioning file:")
                 err = True
             End Try
@@ -477,7 +477,7 @@ Public Class ClassImport_Windream
             End If
 
         Catch ex As Exception
-            ClassLogger.Add(" - Unexpected Error in FileName-Creating: " & vbNewLine & ex.Message)
+            LOGGER.Warn(" - Unexpected Error in FileName-Creating: " & vbNewLine & ex.Message)
             MsgBox(" - Unexpected Error in FileName-Creating: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
             Return False
         End Try
@@ -497,9 +497,9 @@ Public Class ClassImport_Windream
             '####
             ' alle Vorkommen innerhalb des Ordnerstrings durchlaufen
             For Each element As System.Text.RegularExpressions.Match In elemente
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> Elementname in FolderString: '" & element.ToString & "'", False)
+                LOGGER.Debug("Elementname in FolderString: '" & element.ToString & "'")
                 Dim EL_SUBSTRING = element.Value.Substring(2, 1).ToUpper
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> EL_SUBSTRING is: '" & EL_SUBSTRING & "'", False)
+                LOGGER.Debug("EL_SUBSTRING is: '" & EL_SUBSTRING & "'")
                 Select Case EL_SUBSTRING
                     'Manueller Indexwert
                     Case "A"
@@ -511,11 +511,11 @@ Public Class ClassImport_Windream
                                 Dim sql = "SELECT SQL_RESULT FROM TBDD_INDEX_AUTOM WHERE GUID = " & INDEX_ID
                                 Dim sql_command = ClassDatabase.Execute_Scalar(sql)
                                 If IsNothing(sql_command) Then
-                                    ClassLogger.Add(" >> unexpected: SQL_RESULT is nothing!!", False)
+                                    LOGGER.Warn("unexpected: SQL_RESULT is nothing!!")
-                                    ClassLogger.Add(" >> " & sql, False)
+                                    LOGGER.Warn("" & sql)
                                 Else
                                     If IsDBNull(sql_command) Then
-                                        ClassLogger.Add(" >> unexpected: sql_command is DBNULL!!", False)
+                                        LOGGER.Warn("unexpected: sql_command is DBNULL!!")
                                     Else
                                         sql_command = sql_command.ToString.ToUpper.Replace("@RECORD-ID", CURRENT_RECORD_ID)
                                         sql_command = sql_command.ToString.ToUpper.Replace("@RECORD_ID", CURRENT_RECORD_ID)
@@ -523,13 +523,13 @@ Public Class ClassImport_Windream
                                         sql_command = sql_command.ToString.ToUpper.Replace("@ENTITY_ID", CURRENT_ENTITY_ID)
                                         Dim AUTOindexresult = ClassDatabase.Execute_Scalar(sql_command, True)
                                         If IsNothing(AUTOindexresult) Then
-                                            ClassLogger.Add(">> unexpected: AUTOindexresult is nothing!!", False)
+                                            LOGGER.Warn("unexpected: AUTOindexresult is nothing!!")
-                                            ClassLogger.Add(">> " & sql_command, False)
+                                            LOGGER.Warn("" & sql_command)
                                         Else
                                             If IsDBNull(AUTOindexresult) Then
-                                                ClassLogger.Add(">> unexpected: AUTOindexresult is DBNULL - " & sql_command, False)
+                                                LOGGER.Warn("unexpected: AUTOindexresult is DBNULL - " & sql_command)
                                             Else
-                                                If LogErrorsOnly = False Then ClassLogger.Add(" >> AUTOindexresult is: '" & AUTOindexresult & "'", False)
+                                                LOGGER.Debug("AUTOindexresult is: '" & AUTOindexresult & "'")
                                                 FolderConvention = FolderConvention.Replace(element.ToString, AUTOindexresult)
                                             End If
                                         End If
@@ -537,32 +537,32 @@ Public Class ClassImport_Windream
                                     End If
                                 End If
                             Else
-                                ClassLogger.Add(">> INDEX_ID is not numeric:  " & INDEX_ID.ToString & "- APattern: " & element.Value, False)
+                                LOGGER.Warn("INDEX_ID is not numeric:  " & INDEX_ID.ToString & "- APattern: " & element.Value)
                             End If
                         Else
-                            ClassLogger.Add(">> split.Length <> 2 - APattern: " & element.Value, False)
+                            LOGGER.Warn("split.Length <> 2 - APattern: " & element.Value)
                         End If
 
                     Case "M"
-                        If LogErrorsOnly = False Then ClassLogger.Add(" >> Working on manual value......'", False)
+                        LOGGER.Debug("Working on manual value......'")
                         Dim split() As String = element.Value.Substring(3, element.Value.Length - 4).Split("#")
                         If split.Length = 2 Then
                             'Die GUID des AutoIndex auslesen
                             Dim INDEX_ID = split(1)
                             If IsNumeric(INDEX_ID) Then
                                 If element.Value.ToUpper.Contains("FOLDERSELECT") Then
-                                    If LogErrorsOnly = False Then ClassLogger.Add(" >> FOLDERSELECT......'", False)
+                                    LOGGER.Debug("FOLDERSELECT......'")
                                     For Each row As DataRow In CURRENT_TBPMO_INDEX_MAN.Rows
                                         If row.Item("GUID") = INDEX_ID Then
                                             Dim manvalue = row.Item("MAN_VALUE")
                                             If manvalue <> String.Empty Then
-                                                If LogErrorsOnly = False Then ClassLogger.Add(" >> folder value is: '" & manvalue & "'", False)
+                                                LOGGER.Debug("folder value is: '" & manvalue & "'")
                                                 CURRENT_VARIABLE_FOLDER_OVERRIDE = True
                                                 CURRENT_VARIABLE_FOLDER = manvalue
                                                 Return True
 
                                             Else
-                                                ClassLogger.Add(">> Attention: manvalue (from Input indexing is empty!!", False)
+                                                LOGGER.Warn("Attention: manvalue (from Input indexing is empty!!")
                                             End If
                                         End If
                                     Next
@@ -573,21 +573,21 @@ Public Class ClassImport_Windream
                                         If row.Item("GUID") = INDEX_ID Then
                                             Dim manvalue = row.Item("MAN_VALUE")
                                             If manvalue <> String.Empty Then
-                                                If LogErrorsOnly = False Then ClassLogger.Add(" >> manvalue is: '" & manvalue & "'", False)
+                                                LOGGER.Debug("manvalue is: '" & manvalue & "'")
                                                 FolderConvention = FolderConvention.Replace(element.ToString, manvalue)
                                                 FolderConvention = FolderConvention.Replace("\\", "")
                                             Else
-                                                ClassLogger.Add(">> Attention: manvalue (from Input indexing is empty!!", False)
+                                                LOGGER.Warn("Attention: manvalue (from Input indexing is empty!!")
                                             End If
                                         End If
                                     Next
 
                                 End If
                             Else
-                                ClassLogger.Add(">> INDEX_ID is not numeric:  " & INDEX_ID.ToString & "- APattern: " & element.Value, False)
+                                LOGGER.Warn("INDEX_ID is not numeric:  " & INDEX_ID.ToString & "- APattern: " & element.Value)
                             End If
                         Else
-                            ClassLogger.Add(">> split.Length <> 2 - APattern: " & element.Value, False)
+                            LOGGER.Warn("split.Length <> 2 - APattern: " & element.Value)
                         End If
 
 
@@ -596,7 +596,7 @@ Public Class ClassImport_Windream
                         Dim split() As String = elmt
                         If split.Length = 2 Then
                             Dim VARTYPE = split(0)
-                            If LogErrorsOnly = False Then ClassLogger.Add(" >> VARTYPE is: '" & VARTYPE & "'", False)
+                            LOGGER.Debug("VARTYPE is: '" & VARTYPE & "'")
                             Select Case VARTYPE
                                 Case "ARDoctype"
                                     FolderConvention = FolderConvention.Replace(element.ToString, CURRENT_DOKARTSTRING)
@@ -646,22 +646,22 @@ Public Class ClassImport_Windream
                                         lblsql = lblsql.ToString.ToUpper.Replace("@RECORD-ID", CURRENT_RECORD_ID)
                                         lblsql = lblsql.ToString.ToUpper.Replace("@ENTITY-ID", CURRENT_ENTITY_ID)
                                         lblsql = lblsql.ToString.ToUpper.Replace("@ENTITY_ID", CURRENT_ENTITY_ID)
-                                        If LogErrorsOnly = False Then ClassLogger.Add(" >> variable sql will be used for convention", False)
+                                        LOGGER.Debug("variable sql will be used for convention")
                                         Dim result = ClassDatabase.Execute_ScalarWithConnection(DTtype.Rows(0).Item(2), lblsql)
                                         If Not IsNothing(result) Then
                                             FolderConvention = FolderConvention.Replace(element.ToString, result.ToString)
                                         Else
-                                            ClassLogger.Add(">> variable sqlresult is nothing - " & lblsql, False)
+                                            LOGGER.Warn("variable sqlresult is nothing - " & lblsql)
                                         End If
                                     Else
-                                        ClassLogger.Add(">> Variable folder should be filled with value of Control-ID '" & CONTROL_ID & "', but result was nothing.", False)
+                                        LOGGER.Warn("Variable folder should be filled with value of Control-ID '" & CONTROL_ID & "', but result was nothing.")
-                                        ClassLogger.Add(">> SQL-Command: " & checktype)
+                                        LOGGER.Warn("SQL-Command: " & checktype)
                                     End If
 
                                 Else
                                     If IsDBNull(CONTROLVALUE) Then
-                                        ClassLogger.Add(">> Variable folder should be filled with value of Control-ID '" & CONTROL_ID & "', but result was DBNULL.", False)
+                                        LOGGER.Warn("Variable folder should be filled with value of Control-ID '" & CONTROL_ID & "', but result was DBNULL.")
-                                        ClassLogger.Add(">> SQL-Command: " & CURRENT_LAST_SQL)
+                                        LOGGER.Warn("SQL-Command: " & CURRENT_LAST_SQL)
                                     Else
                                         Dim sql1 = "SELECT * FROM TBPMO_WD_NAMECONVENTION_FORMAT WHERE ID = (SELECT TOP 1 GUID FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE DOCTYPE_ID = " & DocTypeID & " AND FORMVIEW_ID = " & CURRENT_FORMVIEW_ID & ")"
                                         Dim DT_FORMAT As DataTable = ClassDatabase.Return_Datatable(sql1, True)
@@ -697,17 +697,17 @@ Public Class ClassImport_Windream
 
 
                     Case Else
-                        ClassLogger.Add(" -Undefined pattern found in folderconvention" & vbNewLine & "Elementname: " & element.Value.ToUpper)
+                        LOGGER.Warn(" -Undefined pattern found in folderconvention" & vbNewLine & "Elementname: " & element.Value.ToUpper)
                         MsgBox("Achtung - in der Namenkonvention wurde ein Element gefunden welches nicht zugeordnet werden kann!" & vbNewLine & "Elementname: " & element.Value.ToUpper, MsgBoxStyle.Exclamation, "Unexpected error in Name generieren:")
                 End Select
-                If LogErrorsOnly = False Then ClassLogger.Add($" >> FolderConvention so far is: '{FolderConvention}'", False)
+                LOGGER.Debug($"FolderConvention so far is: '{FolderConvention}'")
             Next
             CURRENT_VARIABLE_FOLDER = FolderConvention
             Return True
 
         Catch ex As Exception
             MsgBox("Unexpected Error in CreateFolderforIndex-Method:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-            ClassLogger.Add(" >> Fehler in CrFolderForIndex: " & ex.Message, True)
+            LOGGER.Warn("Fehler in CrFolderForIndex: " & ex.Message, True)
             Return False
         End Try
     End Function
@@ -735,7 +735,7 @@ Public Class ClassImport_Windream
             CURRENT_NEWFILENAME = _NewFileString & extension
             Return True
         Catch ex As Exception
-            ClassLogger.Add(" - Error in versioning file - error: " & vbNewLine & ex.Message)
+            LOGGER.Warn(" - Error in versioning file - error: " & vbNewLine & ex.Message)
             MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in versioning file:")
             Return False
         End Try

app/DD-Record-Organizer/ClassInit.vb

@@ -1,13 +1,34 @@
 Imports System.ComponentModel
 Imports System.IO
 Imports DD_LIB_Standards
+Imports DigitalData.Modules.Logging
+
 Public Class ClassInit
     Public Sub New()
     End Sub
 
     Public Sub InitLogger()
-        ClassLogger.Init("", USER_USERNAME)
+        LOGCONFIG = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing,
-        clsLogger.LOGFILE_PATH = ClassLogger.logDateiname
+                                        My.Application.Info.CompanyName,
+                                        "ADDI")
+        LOGGER = LOGCONFIG.GetLogger()
+
+        LOGGER.Info("## ADDI started - {0}", Now)
+        Try
+            Dim directory As New IO.DirectoryInfo(Application.LocalUserAppDataPath & "\Log")
+
+            For Each file As IO.FileInfo In directory.GetFiles
+                If (Now - file.CreationTime).Days > 29 Then
+                    file.Delete()
+                Else
+                    Exit For
+                End If
+
+
+            Next
+        Catch ex As Exception
+
+        End Try
     End Sub
 
     Public Shared Function InitDatabase()
@@ -124,7 +145,7 @@ Public Class ClassInit
             CURRENT_TBPMO_FORM_VIEW = ClassDatabase.Return_Datatable(sql, True)
             sql = String.Format("select T.*, T1.HEADER_CAPTION,T1.TYPE_ID ,T1.ENTITY_ID,T1.LANGUAGE from TBPMO_DOCRESULT_DROPDOWN_ITEMS T, TBPMO_DOCSEARCH_RESULTLIST_CONFIG T1 WHERE T.CONFIG_ID = T1.GUID")
             CURRENT_TBPMO_DOCRESULT_DROPDOWN_ITEMS = ClassDatabase.Return_Datatable(sql, True)
-            clsCURRENT.LOG_ERRORS_ONLY = LogErrorsOnly
+            clsCURRENT.LOG_ERRORS_ONLY = DEBUG
 
             sql = String.Format("select* from TBPMO_FILE_FORMATS_CHANGE")
             Dim oDTFF_CHANGE As DataTable = ClassDatabase.Return_Datatable(sql, True)
@@ -145,7 +166,7 @@ Public Class ClassInit
                                     "And T.ACTIVE = 1 And T1.USER_ID = {0}", USER_GUID)
             CURRENT_TBPMO_CONN_SWITCH = ClassDatabase.Return_Datatable(sql)
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in Init_CONN_SWITCH: " & ex.Message)
+            LOGGER.Warn("Unexpected Error in Init_CONN_SWITCH: " & ex.Message)
         End Try
     End Sub
 
@@ -160,11 +181,11 @@ Public Class ClassInit
 
             Dim sql = String.Format("SELECT T.*, T1.IS_ADMIN FROM TBDD_USER T INNER JOIN TBDD_USER_MODULES T1 ON T.GUID = T1.USER_ID INNER JOIN TBDD_MODULES T2 ON T1.MODULE_ID = T2.GUID  
 WHERE (LOWER(USERNAME) = LOWER('{0}')) AND T2.SHORT_NAME = 'ADDI'", USER_USERNAME)
-            ClassLogger.Add(">> Login at: " & Now.ToString, False)
+            LOGGER.Info("Login at: " & Now.ToString)
-            ClassLogger.Add(">> Username: " & USER_USERNAME, False)
+            LOGGER.Info("Username: " & USER_USERNAME)
             Dim USER_DT As DataTable = ClassDatabase.Return_Datatable(sql, True)
             If USER_DT.Rows.Count = 0 Then
-                ClassLogger.Add(" - User '" & USER_USERNAME & "' not listed in Useradminsitration!", False)
+                LOGGER.Warn(" - User '" & USER_USERNAME & "' not listed in Useradminsitration!")
                 'MsgBox("Achtung: Sie sind nicht in der Userverwaltung hinterlegt." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:")
                 'Me.Close()
                 Dim msg = String.Format("You are not listed in the Useradministration." & vbNewLine & "Please contact the admin.")
@@ -184,7 +205,7 @@ WHERE (LOWER(USERNAME) = LOWER('{0}')) AND T2.SHORT_NAME = 'ADDI'", USER_USERNAM
 
 
                 If Right_RO = False Then
-                    ClassLogger.Add("User '" & USER_USERNAME & "' not authorized for using Record-Organizer!")
+                    LOGGER.Warn("User '" & USER_USERNAME & "' not authorized for using Record-Organizer!")
                     'MsgBox("Achtung: Sie sind nicht für die Nutzung dieses Moduls freigeschaltet." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:")
                     Dim msg = String.Format("Sie sind nicht für die Nutzung dieses Moduls freigeschaltet." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!")
 
@@ -249,18 +270,18 @@ WHERE (LOWER(USERNAME) = LOWER('{0}')) AND T2.SHORT_NAME = 'ADDI'", USER_USERNAM
                     End If
                     Try
                         If clsWindream.Create_Session = False Then
-                            ClassLogger.Add("Could not create the login for windream - No session created!")
+                            LOGGER.Warn("Could not create the login for windream - No session created!")
                             ClassHelper.MSGBOX_Handler("ERROR", "windream-login Error:", "Could not create the login/session!", "ADDI will start anyway but be aware that searching and importing won't be possible!")
                         End If
                     Catch ex As Exception
-                        ClassLogger.Add("Unexpected Error in clswindream.Init: " & ex.Message)
+                        LOGGER.Warn("Unexpected Error in clswindream.Init: " & ex.Message)
                         MsgBox("Unexpected Error in Creating windream-Session: " & ex.Message & vbNewLine & "Please inform Your sysadmin!", MsgBoxStyle.Critical)
                     End Try
 
                     sql = String.Format("SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE UPPER(MODULE) = UPPER('Record-Organizer') AND CLIENT_ID = {0}", CLIENT_SELECTED)
                     Dim anzahl = ClassDatabase.Execute_Scalar(sql, False)
                     USERS_LOGGED_IN = CInt(anzahl)
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> User# logged in: " & anzahl.ToString, False)
+                    LOGGER.Debug("User# logged in: " & anzahl.ToString)
                     '####
 
                     If LICENSE_COUNT < USERS_LOGGED_IN And LICENSE_EXPIRED = False Then
@@ -271,12 +292,12 @@ WHERE (LOWER(USERNAME) = LOWER('{0}')) AND T2.SHORT_NAME = 'ADDI'", USER_USERNAM
                                                 "Number of licenses: " & LICENSE_COUNT.ToString & vbNewLine & "Please contact Your admin!")
                         End If
                         MsgBox(msg, MsgBoxStyle.Exclamation)
-                        ClassLogger.Add(" >> The number of logged Users (" & USERS_LOGGED_IN.ToString & ") exceeds the number of licenses (" & LICENSE_COUNT & ") ", False)
+                        LOGGER.Warn("The number of logged Users (" & USERS_LOGGED_IN.ToString & ") exceeds the number of licenses (" & LICENSE_COUNT & ") ")
                         If USER_IS_ADMIN = False Then
                             'Anmeldung wieder herausnehmen
                             sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_GUID & " AND MODULE= 'Record-Organizer'"
                             ClassDatabase.Execute_non_Query(sql)
-                            ClassLogger.Add(" - logged out the user", False)
+                            LOGGER.Warn(" - logged out the user")
                             Return False
                         End If
                     Else
@@ -292,7 +313,7 @@ WHERE (LOWER(USERNAME) = LOWER('{0}')) AND T2.SHORT_NAME = 'ADDI'", USER_USERNAM
                                 End If
                             End If
                         Catch ex As Exception
-                            ClassLogger.Add("Unexpected Error in Init_Folderwatch: " & ex.Message, True)
+                            LOGGER.Warn("Unexpected Error in Init_Folderwatch: " & ex.Message, True)
                             Return False
                         End Try
 
@@ -305,7 +326,7 @@ WHERE (LOWER(USERNAME) = LOWER('{0}')) AND T2.SHORT_NAME = 'ADDI'", USER_USERNAM
                 End If
             End If
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in InitUserLogin: " & ex.Message)
+            LOGGER.Warn("Unexpected Error in InitUserLogin: " & ex.Message)
             MsgBox("Unexpected Error in InitUserLogin: " & ex.Message, MsgBoxStyle.Critical)
             Return False
         End Try

app/DD-Record-Organizer/ClassLayout.vb

@@ -41,9 +41,9 @@ Public Class ClassWindowLocation
                 If x = 5000 Then
                     Select Case Prefix
                         Case "frmTool_FormDesigner"
-                            ClassLogger.Add(">> frmTool_FormDesigner - Maximize Eigenschaft Form wird nicht gesetzt.", False)
+                            LOGGER.Info("frmTool_FormDesigner - Maximize Eigenschaft Form wird nicht gesetzt.")
                         Case "frmTool_ControlProperties"
-                            ClassLogger.Add(">> frmTool_ControlProperties - Maximize Eigenschaft Form wird nicht gesetzt.", False)
+                            LOGGER.Info("frmTool_ControlProperties - Maximize Eigenschaft Form wird nicht gesetzt.")
                         Case Else
                             form.WindowState = FormWindowState.Maximized
                     End Select
@@ -64,7 +64,7 @@ Public Class ClassWindowLocation
 
             Next
         Catch notFoundEx As System.IO.FileNotFoundException
-            ClassLogger.Add("Window Position & Size added for Screen " & ScreenID & ", Form " & FormID)
+            LOGGER.Warn("Window Position & Size added for Screen " & ScreenID & ", Form " & FormID)
         Catch ex As Exception
             MsgBox("Error while loading Window Position!" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
@@ -103,7 +103,7 @@ Public Class ClassWindowLocation
 
             layout.Save(settings)
         Catch notFoundEx As System.IO.FileNotFoundException
-            ClassLogger.Add("Window Position & Size added for Screen " & ScreenID & ", Form " & FormID)
+            LOGGER.Warn("Window Position & Size added for Screen " & ScreenID & ", Form " & FormID)
         Catch ex As Exception
             MsgBox("Error while saving Window Position!" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try

app/DD-Record-Organizer/ClassLicence.vb

@@ -7,7 +7,7 @@ Public Class ClassLicence
         Try
 
             Dim todayDate As Date = New Date(Now.Year, Now.Month, Now.Day)
-            If LogErrorsOnly = False Then ClassLogger.Add(" >> todayDate: " & todayDate.ToString, False)
+            LOGGER.Debug("todayDate: " & todayDate.ToString)
             _lizenzManager = New ClassLicenseManager("#DigitalData35452!#", "")
             Dim sql As String = String.Format("SELECT LICENSE_PMO FROM TBDD_CLIENT WHERE GUID = {0}", CLIENT_ID)
 
@@ -30,19 +30,19 @@ Public Class ClassLicence
             Dim LICENSE_FILE_DATE As Date
             Try
                 LICENSE_FILE_DATE = New Date(LicDATEsplit(0), LicDATEsplit(1), LicDATEsplit(2))
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> LICENSE_FILE_DATE: " & LICENSE_FILE_DATE.ToString, False)
+                LOGGER.Debug("LICENSE_FILE_DATE: " & LICENSE_FILE_DATE.ToString)
                 Try
                     Try
                         LICENSE_DATE = CDate(LICENSE_FILE_DATE)
                     Catch ex As Exception
-                        ClassLogger.Add(">> Could not read LICENSE_DATE2: " & ex.Message, False)
+                        LOGGER.Warn("Could not read LICENSE_DATE2: " & ex.Message)
                     End Try
 
                 Catch ex As Exception
-                    ClassLogger.Add(">> Could not read LICENSE_DATE1: " & ex.Message, False)
+                    LOGGER.Warn("Could not read LICENSE_DATE1: " & ex.Message)
                 End Try
             Catch ex As Exception
-                ClassLogger.Add(">> Could not read LICENSE_DATE3: " & ex.Message, False)
+                LOGGER.Warn("Could not read LICENSE_DATE3: " & ex.Message)
                 LICENSE_FILE_DATE = New Date(Now.Year, Now.Month, Now.Day)
             End Try
 
@@ -59,7 +59,7 @@ Public Class ClassLicence
             DT_LICENSE_ADDONS = ClassDatabase.Return_Datatable(sql)
             For Each license_Row As DataRow In DT_LICENSE_ADDONS.Rows
                 Dim expired As Boolean = False
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> AddOnName: " & license_Row.Item("NAME"), False)
+                LOGGER.Debug("AddOnName: " & license_Row.Item("NAME"))
                 Dim result = ClassHelper.DecryptString(license_Row.Item("VALID_DATE"), license_Row.Item("NAME"))
                 If result <> "" Then
                     Dim datesplit() = result.ToString.Split("-")
@@ -94,7 +94,7 @@ Public Class ClassLicence
             Try
                 LICENSE_DOSSIER_COUNT = split(2)
             Catch ex As Exception
-                ClassLogger.Add(">> Could not read License for LICENSE_DOSSIER_COUNT: " & ex.Message, False)
+                LOGGER.Warn("Could not read License for LICENSE_DOSSIER_COUNT: " & ex.Message)
                 LICENSE_DOSSIER_COUNT = 0
             End Try
 

app/DD-Record-Organizer/ClassLogger.vb

@@ -1,200 +0,0 @@
-Imports System.IO
-Imports DD_LIB_Standards
-Public Class ClassLogger
-    Public Shared DateiSpeicherort As String = Nothing
-    Public Shared DateiPrefix As String = ""
-    Public Shared Datei As IO.File = Nothing
-    Public Shared logDateiname As String = ""
-    Private Shared StreamWriter As IO.StreamWriter = Nothing
-    Private Shared HasInformedAboutError As Boolean = False
-    ' eine Art Konstruktor
-    Public Shared Sub Init(ByVal speicherort As String, Optional ByVal prefix As String = "", Optional ByVal appendFile As Boolean = True)
-        ' initialisiert den Speicherort
-        ClassLogger.SetSpeicherort()
-        'wenn ein Prfix gesetzt wurde
-        If Not prefix = "" Then
-            'initialisiert das Prefix
-            ClassLogger.SetPrefix(prefix)
-        End If
-        Dim str As String = ClassLogger.DateiSpeicherort & "\" & ClassLogger.DateiPrefix & System.DateTime.Now.ToString("yyyy_MM_dd") & ".txt"
-        Dim anz As Integer = 1
-        Do While File.Exists(str)
-            Dim info As New FileInfo(str)
-            Dim length As Long = info.Length
-            If length > 5000000 Then
-                str = IO.Path.GetDirectoryName(str)
-                str = str & "\" & ClassLogger.DateiPrefix & System.DateTime.Now.ToString("yyyy_MM_dd") & "(" & anz.ToString & ").txt"
-                anz = anz + 1
-            Else
-                Exit Do
-            End If
-        Loop
-        ClassLogger.logDateiname = str
-        If Not appendFile Then
-            ' der Versuch die Datei zu löschen
-            My.Computer.FileSystem.WriteAllText(ClassLogger.logDateiname, String.Empty, False)
-        End If
-        ' testen ob sich die Datei öffnen und beschreiben lässt
-        'ClassNILogger.CheckIsLogWritable()
-    End Sub
-
-    ' legt den Speicherort fest
-    Public Shared Sub SetSpeicherort()
-        Dim f As New IO.DirectoryInfo(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Digital Data\RecordOrganizer\Log"))
-        If IO.Directory.Exists(f.ToString) = False Then
-            IO.Directory.CreateDirectory(f.ToString)
-        End If
-        ClassLogger.DateiSpeicherort = f.ToString
-    End Sub
-
-    ' legt das Prefix für den Dateinamen fest
-    Public Shared Sub SetPrefix(ByVal prefix As String)
-        ClassLogger.DateiPrefix = prefix
-    End Sub
-
-    Public Shared Sub Add(ByVal information As String, Optional ByVal ACHTUNG As Boolean = True, Optional ByVal Essential As Boolean = True)
-        If ClassLogger.OpenFile Then
-            Try
-                If ACHTUNG Then
-                    ClassLogger.StreamWriter.WriteLine(String.Format("{0}: #ATTENTION# : {1}", Now.ToString, information))
-                    If clsDatabase.DB_DEFAULT_INITIALIZED = True And USER_GUID > 0 And Essential = True Then
-                        ClassHelper.InsertEssential_Log(USER_GUID, "USER-ID", information)
-                    Else
-                        ClassLogger.StreamWriter.WriteLine(String.Format("{0},{1},{2}", clsDatabase.DB_DEFAULT_INITIALIZED.ToString, USER_GUID.ToString, Essential.ToString))
-                    End If
-                Else
-                    ClassLogger.StreamWriter.WriteLine(String.Format("{0}: {1}", Now.ToString, information))
-                End If
-                ClassLogger.CloseFile()
-            Catch e As Exception
-                ClassLogger.ShowErrorMessage()
-            End Try
-        Else
-            ClassLogger.ShowErrorMessage()
-        End If
-    End Sub
-    'Public Shared Sub Add(ByVal ex As Exception)
-    '    If ClassLogger.OpenFile Then
-    '        Try
-    '            ClassLogger.StreamWriter.WriteLine("##### Exception (" & System.DateTime.Now & ")")
-    '            ClassLogger.StreamWriter.WriteLine("##### Error: " & ex.Message & " Source [" & ex.Source & "]")
-    '            ClassLogger.CloseFile()
-    '        Catch e As Exception
-    '            ClassLogger.ShowErrorMessage()
-    '        End Try
-    '    Else
-    '        ClassLogger.ShowErrorMessage()
-    '    End If
-    'End Sub
-    ' öffnet eine Datei zum Schreiben
-    Private Shared Function OpenFile()
-        Try
-            ' wenn ein Speicherort festgelegt wurde
-            If Not ClassLogger.DateiSpeicherort = Nothing Then
-                ' den Dateienamen definieren
-                Dim dateiname As String = ClassLogger.logDateiname
-                ' Datei anlegen wenn noch nicht vorhanden
-                My.Computer.FileSystem.WriteAllText(dateiname, String.Empty, True)
-                ' die Datei zum Schreiben öffnen
-                ClassLogger.StreamWriter = New IO.StreamWriter(dateiname, True, System.Text.Encoding.UTF8)
-            End If
-            ' wenn die Datei erfolgreich geöffnet wurde
-            If ClassLogger.StreamWriter IsNot Nothing Then
-                Return True
-            Else
-                Return False
-            End If
-        Catch ex As Exception
-            Return False
-        End Try
-
-    End Function
-
-    ' öffnet eine Datei zum Schreiben
-    Private Shared Function OpenFile(ByVal DateiSpeicherort As String, ByVal DateiPrefix As String)
-
-        Try
-
-            ' wenn ein Speicherort festgelegt wurde
-            If Not DateiSpeicherort = Nothing And ClassLogger.CheckIsLogWritable() Then
-
-                ' den Dateienamen definieren
-                Dim dateiname As String = ClassLogger.logDateiname
-                ' Datei anlegen wenn noch nicht vorhanden
-                My.Computer.FileSystem.WriteAllText(dateiname, String.Empty, True)
-
-                ' die Datei zum Schreiben öffnen
-                ClassLogger.StreamWriter = New IO.StreamWriter(dateiname, True, System.Text.Encoding.UTF8)
-            End If
-
-            ' wenn die Datei erfolgreich geöffnet wurde
-            If ClassLogger.StreamWriter IsNot Nothing Then
-                Return True
-            Else
-                Return False
-            End If
-
-        Catch ex As Exception
-            Return False
-        End Try
-
-    End Function
-
-
-    ' schliesst die geöffnete Datei
-    Private Shared Sub CloseFile()
-
-        ' wenn eine Datei geöffnet ist
-        If ClassLogger.StreamWriter IsNot Nothing Then
-            ' die Datei schliessen
-            ClassLogger.StreamWriter.Close()
-            ClassLogger.StreamWriter = Nothing
-        End If
-    End Sub
-
-
-    Public Shared Function CheckIsLogWritable()
-
-        If ClassLogger.OpenFile Then
-            Try
-                ClassLogger.CloseFile()
-            Catch e As Exception
-                ClassLogger.ShowErrorMessage()
-                Return False
-            End Try
-        Else
-            ClassLogger.ShowErrorMessage()
-            Return False
-        End If
-
-        Return True
-    End Function
-
-
-    Public Shared Function CheckIsLogWritable(ByVal vDateiSpeicherort As String, ByVal vDateiPrefix As String)
-
-        If ClassLogger.OpenFile(vDateiSpeicherort, vDateiPrefix) Then
-            Try
-                ClassLogger.CloseFile()
-            Catch e As Exception
-                ClassLogger.ShowErrorMessage()
-                Return False
-            End Try
-        Else
-            ClassLogger.ShowErrorMessage()
-            Return False
-        End If
-
-        Return True
-    End Function
-
-
-    Private Shared Sub ShowErrorMessage()
-        If Not ClassLogger.HasInformedAboutError Then
-            MsgBox("Please make sure You can access the logpath and are able to write to the file. This may be due to security privileges or storage place in the drive." & _
-                   vbNewLine & vbNewLine & "A logfile won't be written from now on." & vbNewLine & vbNewLine & "You won't be informed about further logdetails from now on.", _
-                   MsgBoxStyle.Information, "Error opening Logfile")
-            ClassLogger.HasInformedAboutError = True
-        End If
-    End Sub
-End Class

app/DD-Record-Organizer/ClassMoreMetadata.vb

@@ -13,7 +13,7 @@
                 Return foundRowsLevel0(i)(COL_NAME)
             Next
         Catch ex As Exception
-            ClassLogger.Add(" - Unvorhergesehener Fehler in Return_CURRENT_TBPMO_INDEX_MAN_VALUE - Fehler: " & vbNewLine & ex.Message)
+            LOGGER.Warn(" - Unvorhergesehener Fehler in Return_CURRENT_TBPMO_INDEX_MAN_VALUE - Fehler: " & vbNewLine & ex.Message)
             Return Nothing
         End Try
     End Function

app/DD-Record-Organizer/ClassNodeNavigation.vb

@@ -32,7 +32,7 @@ Public Class ClassNodeNavigation
             End Using
         Catch ex As Exception
             MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in CreateNodeProcedure: ")
-            ClassLogger.Add("Error in CreateNodeProcedure: " & ex.Message, True)
+            LOGGER.Warn("Error in CreateNodeProcedure: " & ex.Message)
             Return 0
         End Try
     End Function
@@ -96,14 +96,14 @@ Public Class ClassNodeNavigation
             Dim NODE_ID
             Dim NODE_CONFIG_ID
             Dim staticListItems = myTreeNode.Tag.Split("#")
-            If LogErrorsOnly = False Then ClassLogger.Add($"SUB CNCID.myTreeNode.Tag  [{myTreeNode.Tag.ToString}]", False)
+            LOGGER.Debug($"SUB CNCID.myTreeNode.Tag  [{myTreeNode.Tag.ToString}]", False)
             If staticListItems(0).Contains("NODE-TYPE") Or staticListItems(0).Contains("CONFIG_NODE") Then
                 ' NODE_ID = staticListItems(0).ToString.Replace("NODE-TYPE-", "")
                 NODE_ID = Return_NODEID_forTag(myTreeNode.Tag)
                 NODE_CONFIG_ID = Return_NODE_CONFIG_ID_forTag(myTreeNode.Tag)
-                If LogErrorsOnly = False Then ClassLogger.Add($"SUB CNCID.Checking nodeconfig on NODE_ID [{NODE_ID.ToString}] and NODE_CONFIG_ID [{NODE_CONFIG_ID.ToString}]", False)
+                LOGGER.Debug($"SUB CNCID.Checking nodeconfig on NODE_ID [{NODE_ID.ToString}] and NODE_CONFIG_ID [{NODE_CONFIG_ID.ToString}]", False)
             Else
-                If LogErrorsOnly = False Then ClassLogger.Add($"Attention no NODE-TYPE in staticListItems(0)  [{staticListItems(0).ToString}]", False)
+                LOGGER.Debug($"Attention no NODE-TYPE in staticListItems(0)  [{staticListItems(0).ToString}]", False)
             End If
             If NODE_CONFIGURABLE_NODES_DT.Rows.Count > 0 And IsNumeric(NODE_ID) Then
                 'Prüfen ob es für dieses Level einen konfigurierbaren Knoten gibt
@@ -127,25 +127,25 @@ Public Class ClassNodeNavigation
 
 
                 If Not IsNothing(ID) Then
-                    If LogErrorsOnly = False Then ClassLogger.Add($"SUB CNCID.We have a NODE_CONFIGURABLE_ID [{ID.ToString}]!!", False)
+                    LOGGER.Debug($"SUB CNCID.We have a NODE_CONFIGURABLE_ID [{ID.ToString}]!!", False)
                     ClassNodeNavigation.NODE_CONFIGURABLE_ID = ID
                     CURRENT_NODE_CONFIGURABLE_ID = ID
                 Else
-                    If LogErrorsOnly = False Then ClassLogger.Add($"SUB CNCID.NODE_CONFIGURABLE_ID is nothing!!", False)
+                    LOGGER.Debug($"SUB CNCID.NODE_CONFIGURABLE_ID is nothing!!", False)
-                    ' If LogErrorsOnly = False Then ClassLogger.Add("CURRENT_NODE_CONFIGURABLE_ID would be nothing...", False)
+                    ' LOGGER.Debug("CURRENT_NODE_CONFIGURABLE_ID would be nothing...", False)
                     CURRENT_NODE_CONFIGURABLE_ID = 0
                 End If
             Else
                 If IsNumeric(NODE_ID) = False Then
-                    If LogErrorsOnly = False Then ClassLogger.Add("SUB CNCID.NODE_ID is not numeric", False)
+                    LOGGER.Debug("SUB CNCID.NODE_ID is not numeric", False)
                 Else
-                    If LogErrorsOnly = False Then ClassLogger.Add("SUB CNCID.NO NODE_CONFIGURABLE_NODES_DT", False)
+                    LOGGER.Debug("SUB CNCID.NO NODE_CONFIGURABLE_NODES_DT", False)
                 End If
 
                 CURRENT_NODE_CONFIGURABLE_ID = 0
             End If
         Catch ex As Exception
-            If LogErrorsOnly = False Then ClassLogger.Add("SUB CNCID.CURRENT_NODE_CONFIGURABLE_ID would be nothing(1)...", False)
+            LOGGER.Debug("SUB CNCID.CURRENT_NODE_CONFIGURABLE_ID would be nothing(1)...", False)
             ClassNodeNavigation.NODE_CONFIGURABLE_ID = 0
             CURRENT_NODE_CONFIGURABLE_ID = 0
         End Try
@@ -166,7 +166,7 @@ Public Class ClassNodeNavigation
             End If
             Return TagString
         Catch ex As Exception
-            ClassLogger.Add(">> Unexpected Error in CreateNODE_TAG (NodeNavigation): " & ex.Message, True)
+            LOGGER.Warn("Unexpected Error in CreateNODE_TAG (NodeNavigation): " & ex.Message)
             MsgBox("Error in CreateNODE_TAG (NodeNavigation):" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
             TagString = "ERROR NODETAG_CREATION"
             Return TagString
@@ -220,7 +220,7 @@ Public Class ClassNodeNavigation
                     End If
 
                 Catch ex As Exception
-                    ClassLogger.Add(">> Unexpected Error in Formatting NodeColor (CreateTreViewNodes): " & ex.Message, True)
+                    LOGGER.Warn("Unexpected Error in Formatting NodeColor (CreateTreViewNodes): " & ex.Message)
                 End Try
 
 
@@ -232,7 +232,7 @@ Public Class ClassNodeNavigation
             sw.Done()
             Return mytrv
         Catch ex As System.Exception
-            ClassLogger.Add(">> Unexpected Error in CreateTreeViewNodes (NodeNavigation-CreateTreViewNodes): " & ex.Message, True)
+            LOGGER.Warn("Unexpected Error in CreateTreeViewNodes (NodeNavigation-CreateTreViewNodes): " & ex.Message)
             MsgBox("Error in CreateTreeViewNodes (NodeNavigation):" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
             Return Nothing
         End Try
@@ -290,7 +290,7 @@ Public Class ClassNodeNavigation
 
 
             Catch ex As Exception
-                ClassLogger.Add(">> Unexpected Error in Formatting NodeColor (Subnodes): " & ex.Message, True)
+                LOGGER.Warn("Unexpected Error in Formatting NodeColor (Subnodes): " & ex.Message)
             End Try
             CheckSubNodes(DT_TREEVIEW_NODES, SUB_NODE_ROW(i)("GUID"), TREEVIEW_IMAGELIST, SUB_NODE, SUB_NODE_ROW(i)("EXPAND_NODE"))
             'Add the node
@@ -317,7 +317,7 @@ Public Class ClassNodeNavigation
             Next
             Return Nothing
         Catch ex As Exception
-            ClassLogger.Add(">> Unexpected Error in FindNode (NodeNavigation): " & ex.Message, True)
+            LOGGER.Warn("Unexpected Error in FindNode (NodeNavigation): " & ex.Message)
             MsgBox("Error in FindNode (NodeNavigation):" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
             Return Nothing
         End Try
@@ -333,7 +333,7 @@ Public Class ClassNodeNavigation
                 Dim staticListItems = NodeString.Split("#")
                 Return staticListItems(1)
             Catch ex As Exception
-                ClassLogger.Add("Unexpected Error in Return_ENTITY_FOR_TAG ('" & NodeString & "'): " & ex.Message, True)
+                LOGGER.Warn("Unexpected Error in Return_ENTITY_FOR_TAG ('" & NodeString & "'): " & ex.Message)
                 Return 0
             End Try
         End If
@@ -356,7 +356,7 @@ Public Class ClassNodeNavigation
                     End If
                 Catch ex As Exception
                     sw.Done()
-                    ClassLogger.Add("Unexpected Error in Return_RECORD_forTag ('" & NodeString & "'): " & ex.Message, True)
+                    LOGGER.Warn("Unexpected Error in Return_RECORD_forTag ('" & NodeString & "'): " & ex.Message)
                     Return 0
                 End Try
             Else

app/DD-Record-Organizer/ClassOfficeTemplate.vb

@@ -41,7 +41,7 @@ Public Class ClassOfficeTemplate
             ' word.Visible = (True) 'Word sichtbar
 
             For Each cc In doc.ContentControls
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> Office-Pattern: " & cc.Tag, False)
+                LOGGER.Debug("Office-Pattern: " & cc.Tag, False)
                 For Each patternrow As System.Data.DataRow In DT_PATTERNS.Rows
                     If patternrow.Item("NAME_PATTERN").ToString.ToUpper = cc.Tag.ToString.ToUpper Then
                         If Not IsDBNull(patternrow.Item("FIXED_VALUE")) Then
@@ -53,20 +53,20 @@ Public Class ClassOfficeTemplate
                                 Dim Control_ID = fvalue '.Replace("@CONTROLID:", "")
                                 Try
                                     If CInt(Control_ID) Then
-                                        If LogErrorsOnly = False Then ClassLogger.Add(" >> Get Value for Control-ID: " & Control_ID.ToString, False)
+                                        LOGGER.Debug("Get Value for Control-ID: " & Control_ID.ToString, False)
                                         Dim value_akt = ClassDatabase.Execute_Scalar("SELECT VALUE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = " & Control_ID & " AND RECORD_ID = " & Record_ID)
                                         If Not IsNothing(value_akt) Then
                                             cc.Range.Text = value_akt.ToString
                                         Else
-                                            ClassLogger.Add("Für Control-ID '" & Control_ID & "' konnte kein Wert gelesen werden!", True)
+                                            LOGGER.Warn("Für Control-ID '" & Control_ID & "' konnte kein Wert gelesen werden!")
                                         End If
                                     End If
                                 Catch ex As Exception
-                                    ClassLogger.Add("Unerwarteter Fehler beim Auslesen eines Control-Wertes in Pattern-For: " & ex.Message, True)
+                                    LOGGER.Warn("Unerwarteter Fehler beim Auslesen eines Control-Wertes in Pattern-For: " & ex.Message)
                                 End Try
                                 'End If
                                 'Else
-                                '    If LogErrorsOnly = False Then ClassLogger.Add(" >> Pattern wird mit festem Wert '" & patternrow.Item("FIXED_VALUE") & "' gefüllt!", False)
+                                '    LOGGER.Debug("Pattern wird mit festem Wert '" & patternrow.Item("FIXED_VALUE") & "' gefüllt!", False)
                                 '    cc.Range.Text = patternrow.Item("FIXED_VALUE").ToString
                                 'End If
                             End If
@@ -108,7 +108,7 @@ Public Class ClassOfficeTemplate
                 Return False
             End If
         Catch ex As Exception
-            ClassLogger.Add("Error in Open_Word_Template: " & ex.Message, True)
+            LOGGER.Warn("Error in Open_Word_Template: " & ex.Message)
             MsgBox("Unexpected Error in Open_Word_Template:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
             Return False
         End Try

app/DD-Record-Organizer/ClassPosGrid.vb

@@ -33,7 +33,7 @@ Public Class ClassPosGrid
             Try
                 DT = ClassDatabase.Return_Datatable(sqlCommand)
             Catch ex As Exception
-                ClassLogger.Add("Error in FormatComboColumn: " & ex.Message)
+                LOGGER.Warn("Error in FormatComboColumn: " & ex.Message)
                 Exit Sub
             End Try
 

app/DD-Record-Organizer/ClassRecordCommands.vb

@@ -31,7 +31,7 @@ Public Class ClassRecordCommands
             End Using
         Catch ex As Exception
             MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in CreateRecordProcedure: ")
-            ClassLogger.Add("Error in CreateRecordProcedure: " & ex.Message, True)
+            LOGGER.Warn("Error in CreateRecordProcedure: " & ex.Message)
             ClassHelper.InsertEssential_Log(formId, "ENTITY-ID", "ENTITY-ID: " & formId & ": " & ex.Message)
             Return 0
         End Try
@@ -48,7 +48,7 @@ Public Class ClassRecordCommands
 
     Public Shared Function ConnectRecord(PARENT_RECORD As Integer, LINK_RECORD As Integer, Optional Comment As String = "")
         Dim SQL = "INSERT INTO TBPMO_RECORD_CONNECT(RECORD1_ID,RECORD2_ID,COMMENT,ADDED_WHO) VALUES (" & PARENT_RECORD & "," & LINK_RECORD & ",'" & Comment & "','" & USER_USERNAME & "')"
-        If LogErrorsOnly = False Then ClassLogger.Add(" >> ConnectRecord SQL:  " & SQL, False)
+        LOGGER.Debug("ConnectRecord SQL:  " & SQL, False)
         Return ClassDatabase.Execute_non_Query(SQL)
     End Function
     Public Shared Function CHECK_RECORD_FINAL(RecordId As Integer, IsInsert As Boolean)

app/DD-Record-Organizer/ClassRightManagement.vb

@@ -69,15 +69,15 @@
                     End If
                 End If
             End If
-            If LogErrorsOnly = False Then
+
-                ClassLogger.Add(" >> RIGHT_EDIT_R: " & RIGHT_EDIT_R.ToString, False)
+            LOGGER.Debug("RIGHT_EDIT_R: " & RIGHT_EDIT_R.ToString)
-                ClassLogger.Add(" >> RIGHT_ADD_R: " & RIGHT_ADD_R.ToString, False)
+                LOGGER.Debug("RIGHT_ADD_R: " & RIGHT_ADD_R.ToString)
-                ClassLogger.Add(" >> RIGHT_DELETE_R: " & RIGHT_DELETE_R.ToString, False)
+                LOGGER.Debug("RIGHT_DELETE_R: " & RIGHT_DELETE_R.ToString)
-                ClassLogger.Add(" >> RIGHT_ADD_DOC: " & RIGHT_ADD_DOC.ToString, False)
+                LOGGER.Debug("RIGHT_ADD_DOC: " & RIGHT_ADD_DOC.ToString)
-                ClassLogger.Add(" >> RIGHT_VIEW_DOC: " & RIGHT_VIEW_DOC.ToString, False)
+                LOGGER.Debug("RIGHT_VIEW_DOC: " & RIGHT_VIEW_DOC.ToString)
-                ClassLogger.Add(" >> RIGHT_DELETE_DOC: " & RIGHT_DELETE_DOC.ToString, False)
+                LOGGER.Debug("RIGHT_DELETE_DOC: " & RIGHT_DELETE_DOC.ToString)
-                ClassLogger.Add(" >> RIGHT_READ_ONLY_DOC: " & RIGHT_READ_ONLY_DOC.ToString, False)
+                LOGGER.Debug("RIGHT_READ_ONLY_DOC: " & RIGHT_READ_ONLY_DOC.ToString)
-            End If
+
             sw.Done()
         Catch ex As Exception
             ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in Check_Set_Rights", ex.Message, ex.StackTrace)

app/DD-Record-Organizer/ClassSAP.vb

@@ -4,20 +4,20 @@ Public Class ClassSAP
     Public Shared SAP_CONNECTION As New R3Connection()
     Public Shared Function ConnectionInit(Host As String, SysNumber As String, Username As String, PW As String, Client As String, Lang As String)
         Try
-            If LogErrorsOnly = False Then ClassLogger.Add("", False)
+            LOGGER.Debug("", False)
-            If LogErrorsOnly = False Then ClassLogger.Add(" >> SAP Connect started:", False)
+            LOGGER.Debug("SAP Connect started:", False)
             SAPConnectionString = String.Format("USER={0} LANG={1} CLIENT={2} SYSNR={3} ASHOST={4} PASSWD={5}", Username, Lang, Client, SysNumber, Host, PW)
             Dim con As New R3Connection()
             ERPConnect.LIC.SetLic("W86DWC992C")
-            If LogErrorsOnly = False Then ClassLogger.Add(" >> SAP Connectionstring: " & SAPConnectionString, False)
+            LOGGER.Debug("SAP Connectionstring: " & SAPConnectionString, False)
             con.Open(SAPConnectionString)
             SAP_CONNECTION.Open(SAPConnectionString)
-            If LogErrorsOnly = False Then ClassLogger.Add(" >> SAP-Connection created!", False)
+            LOGGER.Debug("SAP-Connection created!", False)
-            If LogErrorsOnly = False Then ClassLogger.Add("", False)
+            LOGGER.Debug("", False)
             Return True
         Catch ex As Exception
             MsgBox("Error in SAP ConnectionInit: " & ex.Message, MsgBoxStyle.Critical)
-            ClassLogger.Add("Error in SAP ConnectionInit: " & ex.Message, True)
+            LOGGER.Warn("Error in SAP ConnectionInit: " & ex.Message)
             Return False
         End Try
     End Function
@@ -25,29 +25,29 @@ Public Class ClassSAP
         Try
             Dim RESULT_TABLE As DataTable = New DataTable
 
-            If LogErrorsOnly = False Then ClassLogger.Add(" >> Get data from FuBa-Function", False)
+            LOGGER.Debug("Get data from FuBa-Function", False)
             Dim func As RFCFunction
             Try
                 func = SAP_CONNECTION.CreateFunction(FuBaName)
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> func.Execute", False)
+                LOGGER.Debug("func.Execute", False)
                 func.Execute()
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> function was executed", False)
+                LOGGER.Debug("function was executed", False)
             Catch ex As Exception
-                ClassLogger.Add(">> Unexpected Error in Create SAP Function: " & ex.Message, False)
+                LOGGER.Warn("Unexpected Error in Create SAP Function: " & ex.Message, False)
                 MsgBox("Error in Create SAP Function: " & ex.Message, MsgBoxStyle.Critical)
                 Return Nothing
             End Try
             Dim FUNCT_ROW_COUNT As Integer = 1
             Dim RowMaskresult As String = ""
             Try
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> Checking FunctionExecute", False)
+                LOGGER.Debug("Checking FunctionExecute", False)
                 'Den ersten Wert ausgeben lassen um die Spalten zu splitten
 
                 For Each row As RFCStructure In func.Tables("T_INDEX").Rows
                     Try
                         If row.Item(1).ToString.Contains(SplitCharacter) Then
                             RowMaskresult = row.Item(1).ToString
-                            If LogErrorsOnly = False Then ClassLogger.Add(" >> RowMask result: " & RowMaskresult, False)
+                            LOGGER.Debug("RowMask result: " & RowMaskresult, False)
                             FUNCT_ROW_COUNT = 2
                         End If
                     Catch ex As Exception
@@ -56,7 +56,7 @@ Public Class ClassSAP
                     If FUNCT_ROW_COUNT = 2 Then Exit For
                 Next
             Catch ex As Exception
-                ClassLogger.Add(">> Unexpected Error in Checking FunctionExecute: " & ex.Message, False)
+                LOGGER.Warn("Unexpected Error in Checking FunctionExecute: " & ex.Message, False)
                 MsgBox("Error in Checking FunctionExecute: " & ex.Message, MsgBoxStyle.Critical)
                 SAP_CONNECTION.Close()
                 Return Nothing
@@ -65,18 +65,18 @@ Public Class ClassSAP
             Dim ColCount As Integer
             If SplitCharacter <> "" And RowMaskresult.Contains(SplitCharacter) Then
                 Try
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Define Datatable with SplitCharacter method", False)
+                    LOGGER.Debug("Define Datatable with SplitCharacter method", False)
                     Dim split() = RowMaskresult.Split(SplitCharacter)
                     If split.Length > 0 Then
                         ColCount = split.Length - 1
                         CURRENT_COL_COUNT = ColCount
-                        If LogErrorsOnly = False Then
+
-                            ClassLogger.Add(" >> ColCount: " & ColCount.ToString, False)
+                        LOGGER.Debug("ColCount: " & ColCount.ToString, False)
-                            ClassLogger.Add(" >> Split-Results: ", False)
+                            LOGGER.Debug("Split-Results: ", False)
                             For Each s As String In split
-                                ClassLogger.Add("  # " & s, False)
+                                LOGGER.Debug("  # " & s, False)
                             Next
-                        End If
+
                         For x = 0 To ColCount
                             ' Declare DataColumn and DataRow variables.
                             Dim column As DataColumn
@@ -86,14 +86,14 @@ Public Class ClassSAP
                             column.ColumnName = "Column " & x.ToString
                             RESULT_TABLE.Columns.Add(column)
                         Next
-                        If LogErrorsOnly = False Then ClassLogger.Add(" >> Datatable Columns after Split created", False)
+                        LOGGER.Debug("Datatable Columns after Split created", False)
                         ' Create new DataRow objects and add to DataTable.   
                         'Jetzt die Zeilen der Function durchlaufen
                         For Each row As RFCStructure In func.Tables("T_INDEX").Rows
                             Dim new_row As DataRow
                             If RowLimit <> 0 Then
                                 If RowLimit = FUNCT_ROW_COUNT Then
-                                    If LogErrorsOnly = False Then ClassLogger.Add(" >> RowCount limited to" & RowLimit.ToString & " rows. Exit SAP Function", False)
+                                    LOGGER.Debug("RowCount limited to" & RowLimit.ToString & " rows. Exit SAP Function", False)
                                     Exit For
                                 End If
                             End If
@@ -110,13 +110,13 @@ Public Class ClassSAP
                                 RESULT_TABLE.Rows.Add(new_row)
                             End If
                         Next
-                        If LogErrorsOnly = False Then ClassLogger.Add(" >> RowCount FuBa: " & RESULT_TABLE.Rows.Count.ToString, False)
+                        LOGGER.Debug("RowCount FuBa: " & RESULT_TABLE.Rows.Count.ToString, False)
                         Return RESULT_TABLE
                     Else
                         Return Nothing
                     End If
                 Catch ex As Exception
-                    ClassLogger.Add(">> Unexpected Error in Create Datatable with split-method: " & ex.Message, False)
+                    LOGGER.Warn("Unexpected Error in Create Datatable with split-method: " & ex.Message, False)
                     MsgBox("Unexpected Error in Create Datatable with split-method: " & ex.Message, MsgBoxStyle.Critical)
                     SAP_CONNECTION.Close()
                     Return Nothing
@@ -125,7 +125,7 @@ Public Class ClassSAP
                 Return Nothing
             End If
         Catch ex As Exception
-            ClassLogger.Add(">> Unexpected Error in Function FuBa_ReturnDatatable Seperated: " & ex.Message, False)
+            LOGGER.Warn("Unexpected Error in Function FuBa_ReturnDatatable Seperated: " & ex.Message, False)
             MsgBox("Unexpected Error in Function FuBa_ReturnDatatable Seperated: " & ex.Message, MsgBoxStyle.Critical)
             Return Nothing
         End Try
@@ -133,7 +133,7 @@ Public Class ClassSAP
     Public Shared Function Return_Datatable_for_Table(tablename As String, where_clause As String, Optional RowLimit As Integer = 0)
         Try
             Dim RESULT_TABLE As DataTable = New DataTable
-            If LogErrorsOnly = False Then ClassLogger.Add(" >> Get data from SAP Table", False)
+            LOGGER.Debug("Get data from SAP Table", False)
             Dim table As New ERPConnect.Utils.ReadTable(SAP_CONNECTION)
             'Dim cWhereClause = "SAP_OBJECT EQ '<ObjectType>' AND AR_DATE GE '<AR_DATE>'"
             'Dim sSearchDate1 = "20160101"
@@ -146,21 +146,21 @@ Public Class ClassSAP
             If RowLimit <> 0 Then
                 table.RowCount = RowLimit
             End If
-            If LogErrorsOnly = False Then ClassLogger.Add(" >>Table.Run executing.....", False)
+            LOGGER.Debug(" >>Table.Run executing.....", False)
             table.Run()
-            If LogErrorsOnly = False Then ClassLogger.Add(" >>Table.Run executed", False)
+            LOGGER.Debug(" >>Table.Run executed", False)
             RESULT_TABLE = table.Result
             SAP_CONNECTION.Close()
             Return RESULT_TABLE
         Catch ex As Exception
-            ClassLogger.Add(">> Unexpected Error in SAP Table Result: " & ex.Message, False)
+            LOGGER.Warn("Unexpected Error in SAP Table Result: " & ex.Message, False)
             MsgBox("Unexpected Error in SAP Table Result: " & ex.Message, MsgBoxStyle.Critical)
             Return Nothing
         End Try
     End Function
     Public Shared Function LINK_ARC_OBJECT(table As String, barcode As String, contrep As String, docid As String, ardate As String, doctype As String)
         Try
-            If LogErrorsOnly = False Then ClassLogger.Add(" >> CREATE_ARC_OBJECT", False)
+            LOGGER.Debug("CREATE_ARC_OBJECT", False)
             Dim sapfunc As RFCFunction = SAP_CONNECTION.CreateFunction("BAPI_BARCODE_SENDLIST")
 
             'Create and fill the frist row
@@ -185,14 +185,14 @@ Public Class ClassSAP
             End If
 
         Catch ex As Exception
-            ClassLogger.Add(">> Unexpected Error in SAP Table Result: " & ex.Message, False)
+            LOGGER.Warn("Unexpected Error in SAP Table Result: " & ex.Message, False)
             MsgBox("Unexpected Error in CREATE_ARC_OBJECT: " & ex.Message, MsgBoxStyle.Critical)
             Return ex.Message
         End Try
     End Function
     Public Shared Function INSERT_ARCHIVE_OBJECT(ARCHIV_ID As String, ARC_DOC_ID As String, AR_OBJECT As String, OBJECT_ID As String, SAP_OBJECT As String, DOC_TYPE As String, table As String)
         Try
-            If LogErrorsOnly = False Then ClassLogger.Add(" >> INSERT_ARCHIVE_OBJECT", False)
+            LOGGER.Debug("INSERT_ARCHIVE_OBJECT", False)
             Dim sapfunc As RFCFunction = SAP_CONNECTION.CreateFunction("ARCHIV_CONNECTION_INSERT")
 
             'Create and fill the frist row
@@ -222,7 +222,7 @@ Public Class ClassSAP
             Return ""
 
         Catch ex As Exception
-            ClassLogger.Add(">> Unexpected Error in INSERT_ARCHIVE_OBJECT: " & ex.Message, False)
+            LOGGER.Warn("Unexpected Error in INSERT_ARCHIVE_OBJECT: " & ex.Message, False)
             MsgBox("Unexpected Error in INSERT_ARCHIVE_OBJECT: " & ex.Message, MsgBoxStyle.Critical)
             Return ex.Message
         End Try

app/DD-Record-Organizer/ClassUpdate.vb

@@ -47,14 +47,14 @@ Public Class ClassUpdate
                     ALL_USERS = DT_UPDATE.Rows(0).Item("ALL_USERS")
                     sql = String.Format("SELECT * FROM TBDD_VERSION_ITEMS WHERE UPDATE_ID = {0} AND [INFO1] IS NOT NULL ORDER BY GUID", UPDATE_ID)
                     DT_UPDATE_ITEMS = clsDatabase.Return_Datatable(sql)
-                    ClassLogger.Add(String.Format("{0} items need to be updated!", DT_UPDATE_ITEMS.Rows.Count.ToString), False)
+                    LOGGER.Info(String.Format("{0} items need to be updated!", DT_UPDATE_ITEMS.Rows.Count.ToString))
                 Else
-                    ClassLogger.Add(">> No Updates Configured!", False)
+                    LOGGER.Info("No Updates Configured!")
                 End If
             End If
             Return True
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in ClassUpdate - Init: " & ex.Message, True)
+            LOGGER.Warn("Unexpected Error in ClassUpdate - Init: " & ex.Message)
             Return False
         End Try
 
@@ -73,12 +73,12 @@ Public Class ClassUpdate
                     End If
                 Next
                 If RecExe_found = False Then
-                    ClassLogger.Add("Could not find the path for RecordOrganizer", True)
+                    LOGGER.Warn("Could not find the path for RecordOrganizer")
                     Return False
                 End If
             End If
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in InitInstallPath: " & ex.Message, True)
+            LOGGER.Warn("Unexpected Error in InitInstallPath: " & ex.Message)
             Return False
         End Try
     End Function
@@ -101,7 +101,7 @@ Public Class ClassUpdate
                 End If
             Next
         Catch excpt As System.Exception
-            ClassLogger.Add("Unexpected Error in DirSearch: " & excpt.Message, True)
+            LOGGER.Warn("Unexpected Error in DirSearch: " & excpt.Message)
             MY_INSTALL_PATH = ""
         End Try
     End Sub
@@ -112,7 +112,7 @@ Public Class ClassUpdate
             sql = String.Format("SELECT * FROM TBDD_USER WHERE (LOWER(USERNAME) = LOWER('{0}'))", USER_USERNAME)
             Dim USER_DT As DataTable = clsDatabase.Return_Datatable(sql, True)
             If USER_DT.Rows.Count = 0 Then
-                ClassLogger.Add(" - User '" & USER_USERNAME & "' not listed in Useradministration!", False)
+                LOGGER.Warn(" - User '" & USER_USERNAME & "' not listed in Useradministration!")
                 'MsgBox("Achtung: Sie sind nicht in der Userverwaltung hinterlegt." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:")
                 'Me.Close()
                 Dim msg = String.Format("You are not listed in the Useradministration." & vbNewLine & "Please contact the admin.")
@@ -139,7 +139,7 @@ Public Class ClassUpdate
                 Return True
             End If
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in InitUser_Update_Spec: " & ex.Message, True)
+            LOGGER.Warn("Unexpected Error in InitUser_Update_Spec: " & ex.Message)
             Return False
         End Try
 
@@ -185,7 +185,7 @@ Public Class ClassUpdate
         'If FORCE_UPDATE = False Then
 
         '    If VERSIONS_FOR_FORCE_UPDATE.Contains(VERSION_USER) Then
-        '        ClassLogger.Add(String.Format("VersionChecker: ForceUpdate for User as Version '{0}' is used!", VERSION_USER), False)
+        '        Logger.Warn(String.Format("VersionChecker: ForceUpdate for User as Version '{0}' is used!", VERSION_USER), False)
         '        ClassHelper.InsertEssential_Log(USER_GUID, "USER-ID", String.Format("VersionChecker: ForceUpdate for User as Version '{0}' is used!", VERSION_USER))
         '        FORCE_UPDATE = True
         '    End If
@@ -195,7 +195,7 @@ Public Class ClassUpdate
         '    If ALL_USERS = False Then
         '        sql = String.Format("SELECT COUNT(GUID) FROM TBDD_VERSION_USER_UPDATE WHERE USER_ID = {0} AND UPDATE_ID = {1}", USER_GUID, UPDATE_ID)
         '        If clsDatabase.Execute_Scalar(sql) = 0 Then
-        '            ClassLogger.Add(String.Format("VersionChecker: User is not part of update-group - UPDATE-ID: {0}", UPDATE_ID), False)
+        '            Logger.Warn(String.Format("VersionChecker: User is not part of update-group - UPDATE-ID: {0}", UPDATE_ID), False)
         '            ClassHelper.InsertEssential_Log(USER_GUID, "USER-ID", String.Format("VersionChecker: User is not part of update-group - UPDATE-ID: {0}", UPDATE_ID))
         '            Exit Sub
         '        End If
@@ -220,7 +220,7 @@ Public Class ClassUpdate
 
                 Dim error_while_copying = False
                 For Each Upd_item As DataRow In DT_UPDATE_ITEMS.Rows
-                    ClassLogger.Add(String.Format("...working on item {0}: ", Upd_item.Item("ITEM_INFO")), False)
+                    LOGGER.Info(String.Format("...working on item {0}: ", Upd_item.Item("ITEM_INFO")))
 
                     If Upd_item.Item("ITEM_INFO") = "VERSION_CHECKER.exe" Then
                         KEEP_TEMPPATH = Upd_item.Item("BIT3")
@@ -249,8 +249,8 @@ Public Class ClassUpdate
                                     End If
                                 End If
                                 targetfile = targetfile.ToString.Replace("//", "/")
-                                ClassLogger.Add(String.Format("...replacing targetfile '{0}': ", targetfile), False)
+                            LOGGER.Info(String.Format("...replacing targetfile '{0}': ", targetfile))
-                                Try
+                            Try
                                     ' Replace the file.
                                     If File.Exists(targetfile) Then
                                         If File_Rename(targetfile, BackUpOfFileToReplace) = True Then
@@ -258,7 +258,7 @@ Public Class ClassUpdate
                                             If KEEP_TEMPPATH Then
                                                 If CopyFile(sourcefile, targetfile) = True Then
                                                     File_Delete(BackUpOfFileToReplace)
-                                                    ClassLogger.Add(String.Format("...targetfile '{0}' was copied! ", targetfile), False)
+                                                    LOGGER.Warn(String.Format("...targetfile '{0}' was copied! ", targetfile), False)
                                                     Dim updinfo
                                                     If USER_INFO1 <> "" Then
                                                         updinfo = USER_INFO1 & ";" & Upd_item.Item("INFO1") & "V" & Upd_item.Item("INFO2")
@@ -271,7 +271,7 @@ Public Class ClassUpdate
                                             Else
                                                 If MoveFile(sourcefile, targetfile) = True Then
                                                     File_Delete(BackUpOfFileToReplace)
-                                                    ClassLogger.Add(String.Format("...targetfile '{0}' was replaced! ", targetfile), False)
+                                                    LOGGER.Info(String.Format("...targetfile '{0}' was replaced! ", targetfile))
                                                     Dim updinfo
                                                     If USER_INFO1 <> "" Then
                                                         updinfo = USER_INFO1 & ";" & Upd_item.Item("INFO1") & "V" & Upd_item.Item("INFO2")
@@ -281,7 +281,7 @@ Public Class ClassUpdate
                                                     Dim _Sql = String.Format("Update TBDD_VERSION_USER_UPDATE_PATH SET INFO1 = '{2}' WHERE USER_ID = {0} AND UPPER(MODULE_NAME) = UPPER('{1}')", USER_GUID, "Record-Organizer", updinfo)
                                                     clsDatabase.Execute_non_Query(_Sql)
                                                 Else
-                                                    ClassLogger.Add(String.Format("MoveFile was not successfull! BackupFile will be activated!"))
+                                                    LOGGER.Warn(String.Format("MoveFile was not successfull! BackupFile will be activated!"))
                                                     'Verschieben hat nicht geklappt also die Backupdatei wieder umbenennen!
                                                     File_Rename(BackUpOfFileToReplace, targetfile)
                                                 End If
@@ -296,15 +296,15 @@ Public Class ClassUpdate
 
 
                                 Catch ex As Exception
-                                    ClassLogger.Add(String.Format("Error while copying file {0} to {1}: " & ex.Message, sourcefile, targetfile))
+                                LOGGER.Warn(String.Format("Error while copying file {0} to {1}: " & ex.Message, sourcefile, targetfile))
-                                    error_while_replacing = True
+                                error_while_replacing = True
                                     UPDATE_ERROR = True
                                 End Try
 
 
 
                         Catch ex As Exception
-                            ClassLogger.Add(String.Format("Unexpected Error in Replace_Files: {0}", ex.Message))
+                            LOGGER.Warn(String.Format("Unexpected Error in Replace_Files: {0}", ex.Message))
                             UPDATE_ERROR = True
                         End Try
                     End If
@@ -318,20 +318,20 @@ Public Class ClassUpdate
                         'Delete the tempfolder and all data
                         System.IO.Directory.Delete(FOLDER_TEMP, True)
                     Else
-                        ClassLogger.Add(String.Format("TEMP FOLDER SHALL BE KEPT..."), False)
+                        LOGGER.Info(String.Format("TEMP FOLDER SHALL BE KEPT..."), False)
                     End If
 
                 Catch ex As Exception
 
                 End Try
                 'Else
-                '    ClassLogger.Add(String.Format("The temporaryFolder could not be created!"))
+                '    Logger.Warn(String.Format("The temporaryFolder could not be created!"))
                 'End If
             Else
-                ClassLogger.Add(String.Format("The Updatepath '{0}'is not accessible or does not exist", MyServer_UpdatePath))
+                LOGGER.Warn(String.Format("The Updatepath '{0}'is not accessible or does not exist", MyServer_UpdatePath))
             End If
         Else
-            ClassLogger.Add(String.Format("NO ACTION: the Updatepath is empty"))
+            LOGGER.Warn(String.Format("NO ACTION: the Updatepath is empty"))
         End If
 
     End Sub
@@ -343,7 +343,7 @@ Public Class ClassUpdate
             End If
             FOLDER_TEMP = folder
         Catch ex As Exception
-            ClassLogger.Add(String.Format("Error while Creating tempfolder: " & ex.Message))
+            LOGGER.Warn(String.Format("Error while Creating tempfolder: " & ex.Message))
         End Try
 
     End Function
@@ -359,7 +359,7 @@ Public Class ClassUpdate
             Rename(targetfile, Renamefilestring)
             Return True
         Catch ex As Exception
-            ClassLogger.Add(String.Format("ClassUpdate - Unexpected Error in File_Rename: " & "OldPath '{0}'" & "NewPath '{1}'" & "ERROR: {2}", targetfile, Renamefilestring, ex.Message))
+            LOGGER.Warn(String.Format("ClassUpdate - Unexpected Error in File_Rename: " & "OldPath '{0}'" & "NewPath '{1}'" & "ERROR: {2}", targetfile, Renamefilestring, ex.Message))
             UPDATE_ERROR = True
             Return False
         End Try
@@ -369,7 +369,7 @@ Public Class ClassUpdate
             File.Delete(deletefile)
             Return True
         Catch ex As Exception
-            ClassLogger.Add(String.Format("Unexpected Error in File_Delete: " & vbNewLine & "deletefile '{0}'" & vbNewLine & "ERROR: {2}", deletefile, ex.Message))
+            LOGGER.Warn(String.Format("Unexpected Error in File_Delete: " & vbNewLine & "deletefile '{0}'" & vbNewLine & "ERROR: {2}", deletefile, ex.Message))
             UPDATE_ERROR = True
             Return False
         End Try
@@ -379,7 +379,7 @@ Public Class ClassUpdate
             File.Move(sourcefile, targetfile)
             Return True
         Catch ex As Exception
-            ClassLogger.Add(String.Format("Unexpected Error in MoveFile: sourcefile '{0}', targetfile '{1}' - ERROR: {2}", sourcefile, targetfile, ex.Message))
+            LOGGER.Warn(String.Format("Unexpected Error in MoveFile: sourcefile '{0}', targetfile '{1}' - ERROR: {2}", sourcefile, targetfile, ex.Message))
             UPDATE_ERROR = True
             Return False
         End Try
@@ -389,7 +389,7 @@ Public Class ClassUpdate
             File.Copy(sourcefile, destfile, True)
             Return True
         Catch ex As Exception
-            ClassLogger.Add(String.Format("Unexpected Error in CopyFile: sourcefile '{0}', destfile '{1}' - ERROR: {2}", sourcefile, destfile, ex.Message))
+            LOGGER.Warn(String.Format("Unexpected Error in CopyFile: sourcefile '{0}', destfile '{1}' - ERROR: {2}", sourcefile, destfile, ex.Message))
             UPDATE_ERROR = True
             Return False
         End Try

app/DD-Record-Organizer/ClassUser.vb

@@ -6,7 +6,7 @@
             SQL = $"DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = {USER_GUID} AND MODULE = 'Record-Organizer'"
             ClassDatabase.Execute_non_Query(sql)
         Catch ex As Exception
-            ClassLogger.Add("Error while logging out user: " & ex.Message)
+            LOGGER.Warn("Error while logging out user: " & ex.Message)
         End Try
     End Sub
 

app/DD-Record-Organizer/ClassWDRights.vb

@@ -37,13 +37,13 @@ Public Class ClassWDRights
     Public Shared Function Init()
         Try
             MSG_RESULT = ""
-            If LogErrorsOnly = False Then ClassLogger.Add(String.Format(" >> Init ClassWDRights started - " & Now & " ..."), False)
+            LOGGER.Debug(String.Format("Init ClassWDRights started - " & Now & " ..."))
             Dim DT_KONFIG As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBPMO_SERVICE_RIGHT_CONFIG WHERE GUID = 1")
             AD_DOMAIN = DT_KONFIG.Rows(0).Item("AD_DOMAIN")
             AD_USER = DT_KONFIG.Rows(0).Item("AD_USER")
             WD_RIGHT_ADMIN = DT_KONFIG.Rows(0).Item("WD_RIGHT")
             If clsDatabase.DB_PROXY_INITIALIZED = True And ClassProxy.MyLinkedServer <> String.Empty Then
-                ClassLogger.Add("User configured a proxy: " & ClassProxy.MyLinkedServer, False)
+                LOGGER.Info("User configured a proxy: " & ClassProxy.MyLinkedServer)
                 AD_SERVER = ClassProxy.MyLinkedServer
             Else
                 AD_SERVER = DT_KONFIG.Rows(0).Item("AD_SERVER")
@@ -55,25 +55,21 @@ Public Class ClassWDRights
             Try
                 PWplainText = wrapper.DecryptData(DT_KONFIG.Rows(0).Item("AD_USER_PW"))
             Catch ex As Exception
-                ClassLogger.Add("The Userpassword could not be decrypted", False)
+                LOGGER.Warn("The Userpassword could not be decrypted")
                 PWplainText = ""
             End Try
             AD_USER_PW = PWplainText
 
-            If LogErrorsOnly = False Then ClassLogger.Add(String.Format(" >> ClassWDRights Init'ed - AD_DOMAIN: '{0}', AD_USER: '{1}', AD_SERVER: '{2}'", AD_DOMAIN, AD_USER, AD_SERVER), False)
+            LOGGER.Debug(String.Format("ClassWDRights Init'ed - AD_DOMAIN: '{0}', AD_USER: '{1}', AD_SERVER: '{2}'", AD_DOMAIN, AD_USER, AD_SERVER))
             Return True
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in ClassRights Init: " & vbNewLine & ex.Message, True)
+            LOGGER.Warn("Unexpected Error in ClassRights Init: " & vbNewLine & ex.Message)
             Return False
         End Try
     End Function
-    '''Renews all rights of the passed doc-file
-    ''' </summary>
-    ''' <returns>Returns Boolean True when successfull</returns>
-    ''' <remarks></remarks>
     Public Shared Function Doc_Renew_Rights(doc_id As Integer, docpath As String, deleterights As Boolean) As Boolean
         Try
-            If LogErrorsOnly = False Then ClassLogger.Add(String.Format(" >> Working on rights for file: {0}", docpath), False)
+            LOGGER.Debug(String.Format("Working on rights for file: {0}", docpath))
             Dim DT_USER_RIGHT As DataTable
             Dim DT_GROUP_RIGHT As DataTable
             Dim oSession
@@ -86,31 +82,31 @@ Public Class ClassWDRights
                 oSession = GetWMSessionAsUser(AD_DOMAIN, AD_SERVER, AD_USER, AD_USER_PW)
             Catch ex As Exception
                 Dim msg = "Error in Doc_Renew_Rights-GetWMSessionAsUser : " & ex.Message
-                ClassLogger.Add(msg, True)
+                LOGGER.Warn(msg)
                 Return False
             End Try
 
             If Not IsNothing(oSession) Then
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> Session created.", False)
+                LOGGER.Debug("Session created.")
                 Dim sql = String.Format("SELECT * FROM [dbo].[FNPMO_GET_RIGHTS_FOR_DOC] ({0}) where USER_OR_GROUP = 'USER'", doc_id)
                 DT_USER_RIGHT = clsDatabase.Return_Datatable(sql)
                 sql = String.Format("SELECT * FROM [dbo].[FNPMO_GET_RIGHTS_FOR_DOC] ({0}) where USER_OR_GROUP = 'GROUP'", doc_id)
                 DT_GROUP_RIGHT = clsDatabase.Return_Datatable(sql)
                 If IsNothing(DT_USER_RIGHT) Then
                     Dim msg = "Error while receiving rights for DocID"
-                    clsLogger.Add(msg, True)
+                    clsLogger.Add(msg)
                     Return False
                 Else
-                    If LogErrorsOnly = False Then clsLogger.Add(String.Format(" >> Amount of Userrights: {0}", DT_USER_RIGHT.Rows.Count), False)
+                    LOGGER.Debug(String.Format("Amount of Userrights: {0}", DT_USER_RIGHT.Rows.Count))
                 End If
-                If LogErrorsOnly = False Then clsLogger.Add(String.Format(" >> Amount of Grouprights: {0}", DT_GROUP_RIGHT.Rows.Count), False)
+                LOGGER.Debug(String.Format("Amount of Grouprights: {0}", DT_GROUP_RIGHT.Rows.Count))
                 Try
                     'Object definieren
                     oWMObject = oSession.GetWMObjectByPath(0, docpath.Substring(2))
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Object created.", False)
+                    LOGGER.Debug("Object created.")
                 Catch ex As Exception
                     Dim msg = "Error GetWMObjectByPath: (FDSR) " & docpath.Substring(2) & vbNewLine & Err.Description
-                    ClassLogger.Add(msg, True)
+                    LOGGER.Warn(msg)
                     Return False
                 End Try
                 Dim lret
@@ -119,31 +115,31 @@ Public Class ClassWDRights
                     lret = oWMObject.LockRights()
                 Catch ex As Exception
                     Dim msg = "Error while locking file" & ex.Message
-                    ClassLogger.Add(msg, True)
+                    LOGGER.Warn(msg)
                     Return False
                 End Try
 
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> Object locked.", False)
+                LOGGER.Debug("Object locked.")
                 If CBool(lret) = False Then
                     Dim msg = "Error in setting lock .LockRights - Err.Number: " & Err.Number & vbCrLf & Err.Description
-                    ClassLogger.Add(msg, True)
+                    LOGGER.Warn(msg)
                     Return False
                 End If
 
                 ' Rechteträger-Liste holen
                 Dim AccessRights
                 AccessRights = oWMObject.GetWMObjectRelationByName(REL_Document_AccessRight)
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> AccessRights created.", False)
+                LOGGER.Debug("AccessRights created.")
                 'Bei Fehler in Rechteauswertung
                 If Err.Number <> 0 Then
                     Dim msg = "Error in setting REL_Document_AccessRight - Err.Number: " & Err.Number & vbCrLf & Err.Description
-                    ClassLogger.Add(msg, True)
+                    LOGGER.Warn(msg)
                     Return False
                 End If
                 '############################# Rechte löschen ################################################################################
                 '#############################################################################################################################
                 If deleterights = True Then
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> rights for document will now be deleted.", False)
+                    LOGGER.Debug("rights for document will now be deleted.")
                     'Erst einmal alle anderen Rechte löschen
                     Dim i As Integer = 1
                     ' und nun jeden Rechteträger verarbeiten
@@ -153,7 +149,7 @@ Public Class ClassWDRights
                         UserGroupRelation = aRightRelation.GetWMObjectRelationByName(REL_AccessRight_UserOrGroup)
                         If Err.Number <> 0 Then
                             Dim msg = "Error in setting REL_AccessRight_UserOrGroup - Err.Number: " & Err.Number & vbCrLf & Err.Description
-                            ClassLogger.Add(msg, True)
+                            LOGGER.Warn(msg)
                             Return False
                         End If
 
@@ -166,10 +162,10 @@ Public Class ClassWDRights
                         Else
                             _msg = "Right for User: '" & UserOrGroup.aName & "'"""
                         End If
-                        If LogErrorsOnly = False Then ClassLogger.Add(String.Format(" >> [{0}] will now be deleted.", _msg), False)
+                        LOGGER.Debug(String.Format("[{0}] will now be deleted.", _msg))
                         If Err.Number <> 0 Then
                             Dim msg = "Error in setting UserGroupRelation - Err.Number: " & Err.Number & vbCrLf & Err.Description
-                            ClassLogger.Add(msg, True)
+                            LOGGER.Warn(msg)
                             Return False
                         End If
 
@@ -179,14 +175,14 @@ Public Class ClassWDRights
                             AccessRights.Delete2(UserOrGroup, WMAccessRightAllRights)
                         Catch ex As Exception
                             Dim msg = "Error in AccessRights.Delete2 (Doc_RenewRights)  Doc-ID: " & doc_id & " - UserGroup: " & UserOrGroup.aName & " - ErrorMsg: " & ex.Message
-                            ClassLogger.Add(msg, True)
+                            LOGGER.Warn(msg)
                             Continue For
                         End Try
                         i += 1
                         _msg = _msg.Replace(" '", "")
-                            If LogErrorsOnly = False Then ClassLogger.Add(String.Format(" >> {0} was deleted.", _msg), False)
+                        LOGGER.Debug(String.Format("{0} was deleted.", _msg))
                     Next
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> All rights for doc were deleted....", False)
+                    LOGGER.Debug("All rights for doc were deleted....")
                 End If
 
                 Err.Clear()
@@ -200,24 +196,24 @@ Public Class ClassWDRights
                     Try
                         StringUserRight = AD_DOMAIN & "\" & User_Row.Item("USR_NAME")
                         fileright = User_Row.Item("USR_RIGHT")
-                        If LogErrorsOnly = False Then ClassLogger.Add(String.Format(" >> Working on right for user-right: {0}-{1}", StringUserRight, fileright), False)
+                        LOGGER.Debug(String.Format("Working on right for user-right: {0}-{1}", StringUserRight, fileright))
                         Try
                             ' User holen
                             oUSer = oSession.GetWMObjectByName(WMEntityUser, StringUserRight)
-                            If LogErrorsOnly = False Then ClassLogger.Add(" >> got oUSer...", False)
+                            LOGGER.Debug("got oUSer...")
                         Catch ex As Exception
-                            Dim msg = String.Format(">> Could not create windream-Usersession for user '{0}' - check whether user is part of windream-group!", StringUserRight)
+                            Dim msg = String.Format("Could not create windream-Usersession for user '{0}' - check whether user is part of windream-group!", StringUserRight)
-                            ClassLogger.Add(msg, False)
+                            LOGGER.Warn(msg)
                             MSG_RESULT &= msg & vbNewLine
                             Continue For
                         End Try
                         If Not IsNothing(oUSer) Then
                             Try
                                 AccessRights.Insert2(oUSer, fileright) 'WMAccessRightAllRights)
-                                If LogErrorsOnly = False Then ClassLogger.Add(" >> Right was set...", False)
+                                LOGGER.Debug("Right was set...")
                             Catch ex As Exception
-                                Dim msg = String.Format(">> Could not set right for user {0} - AccessRights.Insert2: {1}", StringUserRight, ex.Message)
+                                Dim msg = String.Format("Could not set right for user {0} - AccessRights.Insert2: {1}", StringUserRight, ex.Message)
-                                ClassLogger.Add(msg, True)
+                                LOGGER.Warn(msg)
                                 Continue For
                             End Try
                         End If
@@ -237,7 +233,7 @@ Public Class ClassWDRights
                                 _right = "READ WRITE"
                         End Select
                         MSG_RESULT &= String.Format("Error while working on RightChange:" & vbNewLine & "Fileright: {0}" & vbNewLine & "User: {1} " & vbNewLine & "File: {2}", _right, StringUserRight, docpath) & vbNewLine
-                        ClassLogger.Add(ex.Message)
+                        LOGGER.Warn(ex.Message)
                     End Try
                 Next
 
@@ -250,25 +246,25 @@ Public Class ClassWDRights
                     Try
                         StringGroupRight = AD_DOMAIN & "\" & Group_Row.Item("USR_NAME")
                         fileright = Group_Row.Item("USR_RIGHT")
-                        If LogErrorsOnly = False Then clsLogger.Add(String.Format(" >> Working on right for group-right: {0}-{1}", StringGroupRight, fileright), False)
+                        LOGGER.Debug(String.Format("Working on right for group-right: {0}-{1}", StringGroupRight, fileright))
                         Try
                             ' User holen
                             _oGroup = oSession.GetWMObjectByName(WMEntityGroups, StringGroupRight)
 
-                            If LogErrorsOnly = False Then clsLogger.Add(" >> got Group...", False)
+                            LOGGER.Debug("got Group...")
                         Catch ex As Exception
-                            Dim msg = String.Format(">> Could not create windream-Usersession for group '{0}' - check whether group exists in windream!", StringGroupRight)
+                            Dim msg = String.Format("Could not create windream-Usersession for group '{0}' - check whether group exists in windream!", StringGroupRight)
-                            clsLogger.Add(msg, False)
+                            clsLogger.Add(msg)
                             MSG_RESULT &= msg & vbNewLine
                             Continue For
                         End Try
                         If Not IsNothing(_oGroup) Then
                             Try
                                 AccessRights.Insert2(_oGroup, fileright) 'WMAccessRightAllRights)
-                                If LogErrorsOnly = False Then clsLogger.Add(" >> Right was set...", False)
+                                LOGGER.Debug("Right was set...")
                             Catch ex As Exception
-                                Dim msg = String.Format(">> Could not set right for docID: {0} group {1} - AccessRights.Insert2: {2}", doc_id, StringGroupRight, ex.Message)
+                                Dim msg = String.Format("Could not set right for docID: {0} group {1} - AccessRights.Insert2: {2}", doc_id, StringGroupRight, ex.Message)
-                                clsLogger.Add(msg, True)
+                                clsLogger.Add(msg)
                                 Continue For
                             End Try
                         End If
@@ -295,13 +291,13 @@ Public Class ClassWDRights
                 Try
                     'Speichern nicht vergessen
                     oWMObject.Save()
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Doc was saved...", False)
+                    LOGGER.Debug("Doc was saved...")
                 Catch ex As Exception
                     Dim msg = String.Format("Error at Object2Change.Save - DocID ({0}): {1}", doc_id, ex.Message)
-                    ClassLogger.Add(msg, True)
+                    LOGGER.Warn(msg)
                     If oWMObject.aLocked = True Then
                         oWMObject.unlock()
-                        If LogErrorsOnly = False Then ClassLogger.Add(" >> Doc unlocked after error!", False)
+                        LOGGER.Debug("Doc unlocked after error!")
                     End If
                     Return False
                 End Try
@@ -310,10 +306,10 @@ Public Class ClassWDRights
                 If oWMObject.aLocked = True Then
                     Try
                         oWMObject.unlock()
-                        If LogErrorsOnly = False Then ClassLogger.Add(" >> Doc was unlocked...", False)
+                        LOGGER.Debug("Doc was unlocked...")
                     Catch ex As Exception
                         Dim msg = "Fehler bei Unlock - Error: " & ex.Message
-                        ClassLogger.Add(msg, True)
+                        LOGGER.Warn(msg)
                         Return False
                     End Try
                 End If
@@ -322,13 +318,13 @@ Public Class ClassWDRights
                 Return True
             Else
                 Dim msg = "ERROR : no session could be created (3)!"
-                ClassLogger.Add(msg, True)
+                LOGGER.Warn(msg)
                 Return False
             End If
         Catch ex As Exception
-            ClassLogger.Add(String.Format("Unexpected Error while Doc_Renew_Rightss DocID: {0}", doc_id), True)
+            LOGGER.Warn(String.Format("Unexpected Error while Doc_Renew_Rightss DocID: {0}", doc_id))
             Dim msg = "ErrorMessage: " & vbNewLine & ex.Message
-            ClassLogger.Add(msg, False)
+            LOGGER.Warn(msg)
             Return False
         End Try
     End Function
@@ -346,7 +342,7 @@ Public Class ClassWDRights
             aConnect.ModuleId = 9
             If Err.Number <> 0 Then
                 Dim msg = "Error in CreateObject (aConnect) - Err.Number: " & Err.Number & vbNewLine & Err.Description
-                ClassLogger.Add(msg, True)
+                LOGGER.Warn(msg)
 
                 SessionAsUser = Nothing
                 Return SessionAsUser
@@ -355,7 +351,7 @@ Public Class ClassWDRights
             aUserId = CreateObject("WMOTool.WMUserIdentity")
             If Err.Number <> 0 Then
                 Dim msg = "Error in CreateObject('WMOTool.WMUserIdentity') - Err.Number: " & Err.Number & vbNewLine & Err.Description
-                ClassLogger.Add(msg, True)
+                LOGGER.Warn(msg)
                 SessionAsUser = Nothing
                 Return SessionAsUser
             End If
@@ -370,7 +366,7 @@ Public Class ClassWDRights
 
             If Err.Number <> 0 Then
                 Dim msg = "Error in Connect.Login(aUserId) - Err.Number: " & Err.Number & vbNewLine & Err.Description
-                ClassLogger.Add(msg, True)
+                LOGGER.Warn(msg)
                 SessionAsUser = Nothing
                 Return SessionAsUser
             Else
@@ -383,7 +379,7 @@ Public Class ClassWDRights
         Catch ex As Exception
             Dim msg = "Unexpected Error in DDLibraries-GetWMSessionAsUser: " & ex.Message & vbNewLine & _
                 String.Format("Domain: {0}, ServerName: {1}, UserName: {2}, Password: {3},", Domain, ServerName, UserName, Password)
-            ClassLogger.Add(msg, True)
+            LOGGER.Warn(msg)
             Return Nothing
         End Try
 

app/DD-Record-Organizer/ClassWindreamDocGrid.vb

@@ -41,7 +41,7 @@ Public Class ClassWindreamDocGrid
             DT_RESULTFILES = table
             Return True
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in Initting TableResult Docs: " & ex.Message, True)
+            LOGGER.Warn("Unexpected Error in Initting TableResult Docs: " & ex.Message)
             DT_RESULTFILES = Nothing
             Return False
         End Try
@@ -66,6 +66,23 @@ Public Class ClassWindreamDocGrid
                         newRow("DOC_ID") = 0
                         SELECTED_DOC_ID = 0
                     End Try
+
+                    Try
+                        newRow("INWORK") = False
+                        SELECTED_INWORK = False
+                        Dim oSQL = "Select IN_WORK,IN_WORK_USER FROM TBPMO_DOCRESULT_LIST  where DocID = " + SELECTED_DOC_ID
+                        Dim oDT As DataTable = ClassDatabase.Return_Datatable(oSQL)
+                        If Not IsNothing(oDT) Then
+                            If oDT.Rows.Count = 1 Then
+                                newRow("INWORK") = CBool(oDT.Rows(0).Item("IN_WORK"))
+                                SELECTED_INWORK = CBool(oDT.Rows(0).Item("IN_WORK"))
+                            End If
+                        End If
+                    Catch ex As Exception
+                        newRow("INWORK") = False
+                        SELECTED_INWORK = False
+                    End Try
+
                     Try
                         SELECTED_DOC_RIGHT = gridView.GetRowCellValue(row, "ACCESS_RIGHT")
                         newRow("ACCESS_RIGHT") = gridView.GetRowCellValue(row, SELECTED_DOC_RIGHT)
@@ -83,13 +100,7 @@ Public Class ClassWindreamDocGrid
                     Catch ex As Exception
                         newRow("OBJECTTYPE") = ""
                     End Try
-                    Try
+
-                        newRow("INWORK") = gridView.GetRowCellValue(row, "in work?")
-                        SELECTED_INWORK = gridView.GetRowCellValue(row, "in work?")
-                    Catch ex As Exception
-                        newRow("INWORK") = False
-                        SELECTED_INWORK = False
-                    End Try
                     Try
                         Dim dpn = gridView.GetRowCellValue(row, "Displayname")
                         If IsDBNull(dpn) Or IsNothing(dpn) Then
@@ -134,13 +145,7 @@ Public Class ClassWindreamDocGrid
                 Catch ex As Exception
                     newRow("OBJECTTYPE") = ""
                 End Try
-                Try
+
-                    newRow("INWORK") = gridView.GetFocusedRowCellValue(gridView.Columns("in work?"))
-                    SELECTED_INWORK = gridView.GetFocusedRowCellValue(gridView.Columns("in work?"))
-                Catch ex As Exception
-                    newRow("INWORK") = False
-                    SELECTED_INWORK = False
-                End Try
                 Try
                     Dim dpn = gridView.GetFocusedRowCellValue(gridView.Columns("Displayname"))
                     If IsDBNull(dpn) Or IsNothing(dpn) Then
@@ -229,7 +234,7 @@ Public Class ClassWindreamDocGrid
                             Try
                                 value = ClassDatabase.Execute_Scalar(String.Format("SELECT VALUE FROM TBPMO_DOC_VALUES WHERE CONFIG_ID = {0} AND DocID = {1} AND RECORD_ID = {2}", configId, docId, RECORD_ID))
                             Catch ex As Exception
-                                ClassLogger.Add(String.Format(">> Attention: Could not get Value from TBPMO_DOC_VALUES for ConfigId[{0}], DocId[{1}]: ", configId, docId) & ex.Message, False)
+                                LOGGER.Warn(String.Format("Attention: Could not get Value from TBPMO_DOC_VALUES for ConfigId[{0}], DocId[{1}]: ", configId, docId) & ex.Message)
                             End Try
 
                             row.Item(colName) = value
@@ -237,16 +242,16 @@ Public Class ClassWindreamDocGrid
                     Next
                 Next
             Catch ex As Exception
-                ClassLogger.Add(">> Attention: Could not load values from TBPMO_DOC_VALUES: " & ex.Message, False)
+                LOGGER.Warn("Attention: Could not load values from TBPMO_DOC_VALUES: " & ex.Message)
             End Try
-            If LogErrorsOnly = False Then ClassLogger.Add(" >> Values loaded...", False)
+            LOGGER.Debug("Values loaded...")
             Try
                 ' Tabellen zum DataSet hinzufügen
                 ds.Tables.Add(DT_RESULT)
                 ds.Tables.Add(DT_DETAILS)
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> tables added to ds.Tables...", False)
+                LOGGER.Debug("tables added to ds.Tables...")
             Catch ex As Exception
-                ClassLogger.Add(">> Attention: Could not Add tables to ds.Tables: " & ex.Message, False)
+                LOGGER.Warn("Attention: Could not Add tables to ds.Tables: " & ex.Message)
             End Try
 
             Try
@@ -264,9 +269,9 @@ Public Class ClassWindreamDocGrid
                 ' Parameter `createConstraints` auf false setzen, um erstellung eines unsinnigen
                 ' `foreignKeyConstraints` zu verhindern
                 ds.Relations.Add("docIdDetails", parentColumn, childColumn, False)
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> relationdocIdDetails created...", False)
+                LOGGER.Debug("relationdocIdDetails created...")
             Catch ex As Exception
-                ClassLogger.Add(">> Could not set master-detail Relation DocSearch: " & ex.Message, False)
+                LOGGER.Warn("Could not set master-detail Relation DocSearch: " & ex.Message)
             End Try
 
             Dim gridControl As GridControl = gridView.GridControl
@@ -291,7 +296,7 @@ Public Class ClassWindreamDocGrid
             gridControl.LevelTree.Nodes.Add("docIdDetails", grvwDetail)
         Catch ex As Exception
             MsgBox("Error in FillColumns: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-            ClassLogger.Add(">> Attention: Could not load converted datatable DocSearch: " & ex.Message, False)
+            LOGGER.Warn("Attention: Could not load converted datatable DocSearch: " & ex.Message)
         End Try
 
         AddHandler gridView.MasterRowExpanded, AddressOf gridView_MasterRowExpanded
@@ -416,7 +421,6 @@ Public Class ClassWindreamDocGrid
                         Dim item As New WindreamDocGridComboboxItem()
                         item.ConfigID = matchingRow.Item("CONFIG_ID")
                         item.Value = matchingRow.Item("VALUE")
-
                         dropdown.Items.Add(item)
                     Next
 
@@ -430,7 +434,7 @@ Public Class ClassWindreamDocGrid
                 e.Column.OptionsColumn.AllowEdit = False
             End If
         Catch ex As Exception
-            ClassLogger.Add("Error in detailView_CustomRowCellEdit: " & ex.Message, False)
+            LOGGER.Warn("Error in detailView_CustomRowCellEdit: " & ex.Message)
         End Try
 
     End Sub
@@ -470,7 +474,7 @@ Public Class ClassWindreamDocGrid
                 End If
             End If
         Catch ex As Exception
-            ClassLogger.Add("Unexpected error in gridView_CustomColumnDisplayText: " & ex.Message, False, False)
+            LOGGER.Warn("Unexpected error in gridView_CustomColumnDisplayText: " & ex.Message)
         End Try
 
     End Sub
@@ -522,7 +526,7 @@ Public Class ClassWindreamDocGrid
             End If
             AddHandler detailView.CustomRowCellEdit, AddressOf detailView_CustomRowCellEdit
         Catch ex As Exception
-            ClassLogger.Add("Unexpected error in gridView_MasterRowExpanded: " & ex.Message, False, False)
+            LOGGER.Warn("Unexpected error in gridView_MasterRowExpanded: " & ex.Message)
             MsgBox("Unexpected error in gridView_MasterRowExpanded: " & ex.Message, MsgBoxStyle.Critical)
         End Try
 

app/DD-Record-Organizer/DD-Record-Organizer.vbproj

@@ -11,7 +11,7 @@
     <AssemblyName>DD-Record-Organizer</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>WindowsForms</MyType>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <PublishUrl>publish\</PublishUrl>
@@ -81,21 +81,18 @@
     </Reference>
     <Reference Include="DevExpress.Charts.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      
     </Reference>
     <Reference Include="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="DevExpress.Map.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      
     </Reference>
     <Reference Include="DevExpress.Office.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="DevExpress.Pdf.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      
     </Reference>
     <Reference Include="DevExpress.Pdf.v19.2.Drawing, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -111,26 +108,21 @@
     </Reference>
     <Reference Include="DevExpress.Sparkline.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      
     </Reference>
     <Reference Include="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      
     </Reference>
     <Reference Include="DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="DevExpress.XtraCharts.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      
     </Reference>
     <Reference Include="DevExpress.XtraCharts.v19.2.UI, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      
     </Reference>
     <Reference Include="DevExpress.XtraCharts.v19.2.Wizard, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      
     </Reference>
     <Reference Include="DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -143,7 +135,6 @@
     </Reference>
     <Reference Include="DevExpress.XtraMap.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      
     </Reference>
     <Reference Include="DevExpress.XtraNavBar.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -172,6 +163,9 @@
     <Reference Include="DevExpress.XtraWizard.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
+    <Reference Include="DigitalData.Modules.Logging">
+      <HintPath>..\..\..\DDMonorepo\Modules.Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
     <Reference Include="DLLLicenseManager">
       <HintPath>..\..\lib\DLLLicenseManager.dll</HintPath>
     </Reference>
@@ -197,6 +191,7 @@
       <HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Office.Interop.Outlook, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <EmbedInteropTypes>True</EmbedInteropTypes>
@@ -205,6 +200,9 @@
     <Reference Include="Microsoft.Office.Interop.Word, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.4.7.10\lib\net45\NLog.dll</HintPath>
+    </Reference>
     <Reference Include="Oracle.ManagedDataAccess, Version=4.121.1.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\3rdparty\lib\Oracle Managed Data Access\Oracle.ManagedDataAccess.dll</HintPath>
@@ -212,14 +210,18 @@
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
     <Reference Include="System.Deployment" />
     <Reference Include="System.DirectoryServices" />
     <Reference Include="System.DirectoryServices.AccountManagement" />
     <Reference Include="System.DirectoryServices.Protocols" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.IO.Compression" />
     <Reference Include="System.Runtime.Remoting" />
+    <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Services" />
     <Reference Include="System.Windows.Forms" />
@@ -503,7 +505,6 @@
     <Compile Include="ClassImport_Windream.vb" />
     <Compile Include="ClassInit.vb" />
     <Compile Include="ClassLayout.vb" />
-    <Compile Include="ClassLogger.vb" />
     <Compile Include="ClassDatabase.vb" />
     <Compile Include="ClassControlBuilder.vb" />
     <Compile Include="ClassControlProperties.vb" />
@@ -757,6 +758,7 @@
     <Compile Include="My Project\Application.Designer.vb">
       <AutoGen>True</AutoGen>
       <DependentUpon>Application.myapp</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <Compile Include="My Project\Resources.Designer.vb">
       <AutoGen>True</AutoGen>
@@ -1241,6 +1243,7 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="packages.config" />
     <None Include="Resources\database_go.png" />
   </ItemGroup>
   <ItemGroup>
@@ -1476,6 +1479,7 @@
     <None Include="Resources\brick.png" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Resources\folder_Open_16xMD.png" />
     <None Include="Resources\error.png" />
     <None Include="Resources\error.ico" />
     <None Include="Resources\Error_red_21x20.png" />

app/DD-Record-Organizer/DD_DMSDataSet.xsd

@@ -270,7 +270,7 @@ FROM            TBPMO_FORM_VIEW where FORM_ID = @FORMID and SCREEN_ID = 1</Comma
               <DbSource ConnectionRef="DD_DMSConnectionString (MySettings)" DbObjectName="DD_DMS.dbo.TBPMO_RECORD" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [TBPMO_RECORD] WHERE (([GUID] = @Original_GUID) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ([ADDED_WHEN] = @Original_ADDED_WHEN) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)))</CommandText>
+                    <CommandText>DELETE FROM [TBPMO_RECORD] WHERE ([GUID] = @Original_GUID) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ([ADDED_WHEN] = @Original_ADDED_WHEN) AND (@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND (@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Original" />
@@ -306,7 +306,7 @@ WHERE        (GUID = @RECORD_ID)</CommandText>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [TBPMO_RECORD] SET [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN WHERE (([GUID] = @Original_GUID) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ([ADDED_WHEN] = @Original_ADDED_WHEN) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)));
+                    <CommandText>UPDATE [TBPMO_RECORD] SET [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN WHERE ([GUID] = @Original_GUID) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ([ADDED_WHEN] = @Original_ADDED_WHEN) AND (@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND (@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)));
 SELECT GUID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_RECORD WHERE (GUID = @GUID)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -393,7 +393,7 @@ ORDER BY DOKUMENTTYPE</CommandText>
               <DbSource ConnectionRef="DD_DMSConnectionString (MySettings)" DbObjectName="DD_DMS.dbo.TBPMO_WD_FVIEW_DT_INDEX" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [TBPMO_WD_FVIEW_DT_INDEX] WHERE (([GUID] = @Original_GUID) AND ([FW_DOCTYPE_ID] = @Original_FW_DOCTYPE_ID) AND ([INDEXNAME] = @Original_INDEXNAME) AND ([INDEX_VALUE] = @Original_INDEX_VALUE) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ([ADDED_WHEN] = @Original_ADDED_WHEN) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)))</CommandText>
+                    <CommandText>DELETE FROM [TBPMO_WD_FVIEW_DT_INDEX] WHERE ([GUID] = @Original_GUID) AND ([FW_DOCTYPE_ID] = @Original_FW_DOCTYPE_ID) AND ([INDEXNAME] = @Original_INDEXNAME) AND ([INDEX_VALUE] = @Original_INDEX_VALUE) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ([ADDED_WHEN] = @Original_ADDED_WHEN) AND (@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND (@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_FW_DOCTYPE_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="FW_DOCTYPE_ID" SourceColumnNullMapping="false" SourceVersion="Original" />
@@ -435,7 +435,7 @@ WHERE        (FW_DOCTYPE_ID = @ID)</CommandText>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [TBPMO_WD_FVIEW_DT_INDEX] SET [FW_DOCTYPE_ID] = @FW_DOCTYPE_ID, [INDEXNAME] = @INDEXNAME, [INDEX_VALUE] = @INDEX_VALUE, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN WHERE (([GUID] = @Original_GUID) AND ([FW_DOCTYPE_ID] = @Original_FW_DOCTYPE_ID) AND ([INDEXNAME] = @Original_INDEXNAME) AND ([INDEX_VALUE] = @Original_INDEX_VALUE) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ([ADDED_WHEN] = @Original_ADDED_WHEN) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)));
+                    <CommandText>UPDATE [TBPMO_WD_FVIEW_DT_INDEX] SET [FW_DOCTYPE_ID] = @FW_DOCTYPE_ID, [INDEXNAME] = @INDEXNAME, [INDEX_VALUE] = @INDEX_VALUE, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN WHERE ([GUID] = @Original_GUID) AND ([FW_DOCTYPE_ID] = @Original_FW_DOCTYPE_ID) AND ([INDEXNAME] = @Original_INDEXNAME) AND ([INDEX_VALUE] = @Original_INDEX_VALUE) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ([ADDED_WHEN] = @Original_ADDED_WHEN) AND (@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND (@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)));
 SELECT GUID, FW_DOCTYPE_ID, INDEXNAME, INDEX_VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_WD_FVIEW_DT_INDEX WHERE (GUID = @GUID)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@FW_DOCTYPE_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="FW_DOCTYPE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -663,7 +663,7 @@ FROM            VWPMO_GUI_ENTITY</CommandText>
               <DbSource ConnectionRef="DD_DMSConnectionString (MySettings)" DbObjectName="DD_ECM.dbo.TBPMO_WORKFLOW" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [TBPMO_WORKFLOW] WHERE (([GUID] = @Original_GUID) AND ([TITLE] = @Original_TITLE) AND ((@IsNull_DESCRIPTION = 1 AND [DESCRIPTION] IS NULL) OR ([DESCRIPTION] = @Original_DESCRIPTION)) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ([ADDED_WHEN] = @Original_ADDED_WHEN) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)))</CommandText>
+                    <CommandText>DELETE FROM [TBPMO_WORKFLOW] WHERE ([GUID] = @Original_GUID) AND ([TITLE] = @Original_TITLE) AND (@IsNull_DESCRIPTION = 1 AND [DESCRIPTION] IS NULL) OR ([DESCRIPTION] = @Original_DESCRIPTION)) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ([ADDED_WHEN] = @Original_ADDED_WHEN) AND (@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND (@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_TITLE" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="TITLE" SourceColumnNullMapping="false" SourceVersion="Original" />
@@ -890,7 +890,7 @@ FROM            TBDD_EINGANGSARTEN</CommandText>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [TBDD_EINGANGSARTEN] SET [BEZEICHNUNG] = @BEZEICHNUNG, [BESCHREIBUNG] = @BESCHREIBUNG, [ERSTELLTWER] = @ERSTELLTWER, [ERSTELLTWANN] = @ERSTELLTWANN, [GEANDERTWER] = @GEANDERTWER, [GEAENDERTWANN] = @GEAENDERTWANN WHERE (([GUID] = @Original_GUID) AND ([BEZEICHNUNG] = @Original_BEZEICHNUNG) AND ((@IsNull_BESCHREIBUNG = 1 AND [BESCHREIBUNG] IS NULL) OR ([BESCHREIBUNG] = @Original_BESCHREIBUNG)) AND ([ERSTELLTWER] = @Original_ERSTELLTWER) AND ([ERSTELLTWANN] = @Original_ERSTELLTWANN) AND ((@IsNull_GEANDERTWER = 1 AND [GEANDERTWER] IS NULL) OR ([GEANDERTWER] = @Original_GEANDERTWER)) AND ((@IsNull_GEAENDERTWANN = 1 AND [GEAENDERTWANN] IS NULL) OR ([GEAENDERTWANN] = @Original_GEAENDERTWANN)));
+                    <CommandText>UPDATE [TBDD_EINGANGSARTEN] SET [BEZEICHNUNG] = @BEZEICHNUNG, [BESCHREIBUNG] = @BESCHREIBUNG, [ERSTELLTWER] = @ERSTELLTWER, [ERSTELLTWANN] = @ERSTELLTWANN, [GEANDERTWER] = @GEANDERTWER, [GEAENDERTWANN] = @GEAENDERTWANN WHERE ([GUID] = @Original_GUID) AND ([BEZEICHNUNG] = @Original_BEZEICHNUNG) AND (@IsNull_BESCHREIBUNG = 1 AND [BESCHREIBUNG] IS NULL) OR ([BESCHREIBUNG] = @Original_BESCHREIBUNG)) AND ([ERSTELLTWER] = @Original_ERSTELLTWER) AND ([ERSTELLTWANN] = @Original_ERSTELLTWANN) AND (@IsNull_GEANDERTWER = 1 AND [GEANDERTWER] IS NULL) OR ([GEANDERTWER] = @Original_GEANDERTWER)) AND (@IsNull_GEAENDERTWANN = 1 AND [GEAENDERTWANN] IS NULL) OR ([GEAENDERTWANN] = @Original_GEAENDERTWANN)));
 SELECT GUID, BEZEICHNUNG, BESCHREIBUNG, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN FROM TBDD_EINGANGSARTEN WHERE (GUID = @GUID)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@BEZEICHNUNG" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="BEZEICHNUNG" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -1271,7 +1271,7 @@ SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHE
               <DbSource ConnectionRef="DD_DMSConnectionString (MySettings)" DbObjectName="DD_ECM.dbo.TBPMO_FORM_TYPE" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [TBPMO_FORM_TYPE] WHERE (([GUID] = @Original_GUID) AND ([FORM_TYPE] = @Original_FORM_TYPE) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ([ADDED_WHEN] = @Original_ADDED_WHEN) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)))</CommandText>
+                    <CommandText>DELETE FROM [TBPMO_FORM_TYPE] WHERE ([GUID] = @Original_GUID) AND ([FORM_TYPE] = @Original_FORM_TYPE) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ([ADDED_WHEN] = @Original_ADDED_WHEN) AND (@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND (@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_FORM_TYPE" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="FORM_TYPE" SourceColumnNullMapping="false" SourceVersion="Original" />
@@ -2018,7 +2018,7 @@ SELECT GUID, NAME, EMAIL_FROM, EMAIL_SMTP, EMAIL_USER, EMAIL_PW, ACTIVE, ADDED_W
               <DbSource ConnectionRef="DD_DMSConnectionString (MySettings)" DbObjectName="DD_ECM.dbo.TBDD_CONNECTION" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [TBDD_CONNECTION] WHERE (([GUID] = @Original_GUID) AND ((@IsNull_DESCRIPTION = 1 AND [DESCRIPTION] IS NULL) OR ([DESCRIPTION] = @Original_DESCRIPTION)) AND ((@IsNull_SQL_PROVIDER = 1 AND [SQL_PROVIDER] IS NULL) OR ([SQL_PROVIDER] = @Original_SQL_PROVIDER)) AND ((@IsNull_SERVER = 1 AND [SERVER] IS NULL) OR ([SERVER] = @Original_SERVER)) AND ((@IsNull_DATABASE = 1 AND [DATABASE] IS NULL) OR ([DATABASE] = @Original_DATABASE)) AND ((@IsNull_USERNAME = 1 AND [USERNAME] IS NULL) OR ([USERNAME] = @Original_USERNAME)) AND ((@IsNull_PASSWORD = 1 AND [PASSWORD] IS NULL) OR ([PASSWORD] = @Original_PASSWORD)) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ([AKTIVE] = @Original_AKTIVE) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ([ADDED_WHEN] = @Original_ADDED_WHEN) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)))</CommandText>
+                    <CommandText>DELETE FROM [TBDD_CONNECTION] WHERE ([GUID] = @Original_GUID) AND (@IsNull_DESCRIPTION = 1 AND [DESCRIPTION] IS NULL) OR ([DESCRIPTION] = @Original_DESCRIPTION)) AND (@IsNull_SQL_PROVIDER = 1 AND [SQL_PROVIDER] IS NULL) OR ([SQL_PROVIDER] = @Original_SQL_PROVIDER)) AND (@IsNull_SERVER = 1 AND [SERVER] IS NULL) OR ([SERVER] = @Original_SERVER)) AND (@IsNull_DATABASE = 1 AND [DATABASE] IS NULL) OR ([DATABASE] = @Original_DATABASE)) AND (@IsNull_USERNAME = 1 AND [USERNAME] IS NULL) OR ([USERNAME] = @Original_USERNAME)) AND (@IsNull_PASSWORD = 1 AND [PASSWORD] IS NULL) OR ([PASSWORD] = @Original_PASSWORD)) AND (@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ([AKTIVE] = @Original_AKTIVE) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ([ADDED_WHEN] = @Original_ADDED_WHEN) AND (@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND (@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int16" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="SmallInt" Scale="0" Size="0" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_DESCRIPTION" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="DESCRIPTION" SourceColumnNullMapping="true" SourceVersion="Original" />
@@ -2074,7 +2074,7 @@ FROM            TBDD_CONNECTION</CommandText>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [TBDD_CONNECTION] SET [DESCRIPTION] = @DESCRIPTION, [SQL_PROVIDER] = @SQL_PROVIDER, [SERVER] = @SERVER, [DATABASE] = @DATABASE, [USERNAME] = @USERNAME, [PASSWORD] = @PASSWORD, [COMMENT] = @COMMENT, [AKTIVE] = @AKTIVE, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN WHERE (([GUID] = @Original_GUID) AND ((@IsNull_DESCRIPTION = 1 AND [DESCRIPTION] IS NULL) OR ([DESCRIPTION] = @Original_DESCRIPTION)) AND ((@IsNull_SQL_PROVIDER = 1 AND [SQL_PROVIDER] IS NULL) OR ([SQL_PROVIDER] = @Original_SQL_PROVIDER)) AND ((@IsNull_SERVER = 1 AND [SERVER] IS NULL) OR ([SERVER] = @Original_SERVER)) AND ((@IsNull_DATABASE = 1 AND [DATABASE] IS NULL) OR ([DATABASE] = @Original_DATABASE)) AND ((@IsNull_USERNAME = 1 AND [USERNAME] IS NULL) OR ([USERNAME] = @Original_USERNAME)) AND ((@IsNull_PASSWORD = 1 AND [PASSWORD] IS NULL) OR ([PASSWORD] = @Original_PASSWORD)) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ([AKTIVE] = @Original_AKTIVE) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ([ADDED_WHEN] = @Original_ADDED_WHEN) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)));
+                    <CommandText>UPDATE [TBDD_CONNECTION] SET [DESCRIPTION] = @DESCRIPTION, [SQL_PROVIDER] = @SQL_PROVIDER, [SERVER] = @SERVER, [DATABASE] = @DATABASE, [USERNAME] = @USERNAME, [PASSWORD] = @PASSWORD, [COMMENT] = @COMMENT, [AKTIVE] = @AKTIVE, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN WHERE ([GUID] = @Original_GUID) AND (@IsNull_DESCRIPTION = 1 AND [DESCRIPTION] IS NULL) OR ([DESCRIPTION] = @Original_DESCRIPTION)) AND (@IsNull_SQL_PROVIDER = 1 AND [SQL_PROVIDER] IS NULL) OR ([SQL_PROVIDER] = @Original_SQL_PROVIDER)) AND (@IsNull_SERVER = 1 AND [SERVER] IS NULL) OR ([SERVER] = @Original_SERVER)) AND (@IsNull_DATABASE = 1 AND [DATABASE] IS NULL) OR ([DATABASE] = @Original_DATABASE)) AND (@IsNull_USERNAME = 1 AND [USERNAME] IS NULL) OR ([USERNAME] = @Original_USERNAME)) AND (@IsNull_PASSWORD = 1 AND [PASSWORD] IS NULL) OR ([PASSWORD] = @Original_PASSWORD)) AND (@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ([AKTIVE] = @Original_AKTIVE) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ([ADDED_WHEN] = @Original_ADDED_WHEN) AND (@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND (@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)));
 SELECT GUID, DESCRIPTION, SQL_PROVIDER, SERVER, [DATABASE], USERNAME, PASSWORD, COMMENT, AKTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_CONNECTION WHERE (GUID = @GUID)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@DESCRIPTION" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="DESCRIPTION" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -2517,7 +2517,7 @@ VALUES        (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID)</CommandText>
               <DbSource ConnectionRef="DD_DMSConnectionString (MySettings)" DbObjectName="DD_ECM.dbo.TBPMO_LANGUAGE_OBJECT" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [TBPMO_LANGUAGE_OBJECT] WHERE (([GUID] = @Original_GUID) AND ([LANGUAGE_TYPE] = @Original_LANGUAGE_TYPE) AND ([SCREEN_ID] = @Original_SCREEN_ID) AND ([PMO_OBJECT_NAME] = @Original_PMO_OBJECT_NAME) AND ([CAPTION] = @Original_CAPTION) AND ((@IsNull_HINT = 1 AND [HINT] IS NULL) OR ([HINT] = @Original_HINT)) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)))</CommandText>
+                    <CommandText>DELETE FROM [TBPMO_LANGUAGE_OBJECT] WHERE ([GUID] = @Original_GUID) AND ([LANGUAGE_TYPE] = @Original_LANGUAGE_TYPE) AND ([SCREEN_ID] = @Original_SCREEN_ID) AND ([PMO_OBJECT_NAME] = @Original_PMO_OBJECT_NAME) AND ([CAPTION] = @Original_CAPTION) AND (@IsNull_HINT = 1 AND [HINT] IS NULL) OR ([HINT] = @Original_HINT)) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND (@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND (@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND (@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_LANGUAGE_TYPE" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="LANGUAGE_TYPE" SourceColumnNullMapping="false" SourceVersion="Original" />
@@ -2562,7 +2562,7 @@ FROM            TBPMO_LANGUAGE_OBJECT</CommandText>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [TBPMO_LANGUAGE_OBJECT] SET [LANGUAGE_TYPE] = @LANGUAGE_TYPE, [SCREEN_ID] = @SCREEN_ID, [PMO_OBJECT_NAME] = @PMO_OBJECT_NAME, [CAPTION] = @CAPTION, [HINT] = @HINT, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN WHERE (([GUID] = @Original_GUID) AND ([LANGUAGE_TYPE] = @Original_LANGUAGE_TYPE) AND ([SCREEN_ID] = @Original_SCREEN_ID) AND ([PMO_OBJECT_NAME] = @Original_PMO_OBJECT_NAME) AND ([CAPTION] = @Original_CAPTION) AND ((@IsNull_HINT = 1 AND [HINT] IS NULL) OR ([HINT] = @Original_HINT)) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)));
+                    <CommandText>UPDATE [TBPMO_LANGUAGE_OBJECT] SET [LANGUAGE_TYPE] = @LANGUAGE_TYPE, [SCREEN_ID] = @SCREEN_ID, [PMO_OBJECT_NAME] = @PMO_OBJECT_NAME, [CAPTION] = @CAPTION, [HINT] = @HINT, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN WHERE ([GUID] = @Original_GUID) AND ([LANGUAGE_TYPE] = @Original_LANGUAGE_TYPE) AND ([SCREEN_ID] = @Original_SCREEN_ID) AND ([PMO_OBJECT_NAME] = @Original_PMO_OBJECT_NAME) AND ([CAPTION] = @Original_CAPTION) AND (@IsNull_HINT = 1 AND [HINT] IS NULL) OR ([HINT] = @Original_HINT)) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND (@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND (@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND (@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)));
 SELECT GUID, LANGUAGE_TYPE, SCREEN_ID, PMO_OBJECT_NAME, CAPTION, HINT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_LANGUAGE_OBJECT WHERE (GUID = @GUID)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@LANGUAGE_TYPE" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="LANGUAGE_TYPE" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -3220,7 +3220,7 @@ FROM            TBPMO_STRUCTURE_NODES_CONFIGURATION where GUID = @GUID</CommandT
               <DbSource ConnectionRef="DD_DMSConnectionString (MySettings)" DbObjectName="DD_ECM.dbo.TBPMO_WORKFLOW_TASK_HISTORY" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="false" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [TBPMO_WORKFLOW_TASK_HISTORY] WHERE (([GUID] = @Original_GUID))</CommandText>
+                    <CommandText>DELETE FROM [TBPMO_WORKFLOW_TASK_HISTORY] WHERE ([GUID] = @Original_GUID))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
@@ -3236,7 +3236,7 @@ FROM            TBPMO_STRUCTURE_NODES_CONFIGURATION where GUID = @GUID</CommandT
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [TBPMO_WORKFLOW_TASK_HISTORY] SET [STATE_DESC] = @STATE_DESC, [COMMENT] = @COMMENT, [ADDED_WHO] = @ADDED_WHO WHERE (([GUID] = @Original_GUID));
+                    <CommandText>UPDATE [TBPMO_WORKFLOW_TASK_HISTORY] SET [STATE_DESC] = @STATE_DESC, [COMMENT] = @COMMENT, [ADDED_WHO] = @ADDED_WHO WHERE ([GUID] = @Original_GUID));
 SELECT GUID, STATE_DESC, COMMENT, ADDED_WHO FROM TBPMO_WORKFLOW_TASK_HISTORY WHERE (GUID = @GUID)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@STATE_DESC" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="STATE_DESC" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -3287,7 +3287,7 @@ FROM            VWPMO_RIGHTS_2B_WORKED</CommandText>
               <DbSource ConnectionRef="DD_DMSConnectionString (MySettings)" DbObjectName="DD_ECM_RENOLIT.dbo.TBPMO_RIGHT_USER" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [TBPMO_RIGHT_USER] WHERE (([GUID] = @Original_GUID) AND ([USER_ID] = @Original_USER_ID) AND ([ENTITY_ID] = @Original_ENTITY_ID) AND ([EDIT_REC] = @Original_EDIT_REC) AND ([ADD_REC] = @Original_ADD_REC) AND ([DELETE_REC] = @Original_DELETE_REC) AND ([ADD_DOC] = @Original_ADD_DOC) AND ([READ_ONLY_DOC] = @Original_READ_ONLY_DOC) AND ([DELETE_DOC] = @Original_DELETE_DOC) AND ([FILES_VISIBLE] = @Original_FILES_VISIBLE) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)))</CommandText>
+                    <CommandText>DELETE FROM [TBPMO_RIGHT_USER] WHERE ([GUID] = @Original_GUID) AND ([USER_ID] = @Original_USER_ID) AND ([ENTITY_ID] = @Original_ENTITY_ID) AND ([EDIT_REC] = @Original_EDIT_REC) AND ([ADD_REC] = @Original_ADD_REC) AND ([DELETE_REC] = @Original_DELETE_REC) AND ([ADD_DOC] = @Original_ADD_DOC) AND ([READ_ONLY_DOC] = @Original_READ_ONLY_DOC) AND ([DELETE_DOC] = @Original_DELETE_DOC) AND ([FILES_VISIBLE] = @Original_FILES_VISIBLE) AND (@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND (@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_USER_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="USER_ID" SourceColumnNullMapping="false" SourceVersion="Original" />
@@ -3334,7 +3334,7 @@ FROM            TBPMO_RIGHT_USER</CommandText>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [TBPMO_RIGHT_USER] SET [USER_ID] = @USER_ID, [ENTITY_ID] = @ENTITY_ID, [EDIT_REC] = @EDIT_REC, [ADD_REC] = @ADD_REC, [DELETE_REC] = @DELETE_REC, [ADD_DOC] = @ADD_DOC, [READ_ONLY_DOC] = @READ_ONLY_DOC, [DELETE_DOC] = @DELETE_DOC, [FILES_VISIBLE] = @FILES_VISIBLE, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHEN] = @CHANGED_WHEN WHERE (([GUID] = @Original_GUID) AND ([USER_ID] = @Original_USER_ID) AND ([ENTITY_ID] = @Original_ENTITY_ID) AND ([EDIT_REC] = @Original_EDIT_REC) AND ([ADD_REC] = @Original_ADD_REC) AND ([DELETE_REC] = @Original_DELETE_REC) AND ([ADD_DOC] = @Original_ADD_DOC) AND ([READ_ONLY_DOC] = @Original_READ_ONLY_DOC) AND ([DELETE_DOC] = @Original_DELETE_DOC) AND ([FILES_VISIBLE] = @Original_FILES_VISIBLE) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)));
+                    <CommandText>UPDATE [TBPMO_RIGHT_USER] SET [USER_ID] = @USER_ID, [ENTITY_ID] = @ENTITY_ID, [EDIT_REC] = @EDIT_REC, [ADD_REC] = @ADD_REC, [DELETE_REC] = @DELETE_REC, [ADD_DOC] = @ADD_DOC, [READ_ONLY_DOC] = @READ_ONLY_DOC, [DELETE_DOC] = @DELETE_DOC, [FILES_VISIBLE] = @FILES_VISIBLE, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHEN] = @CHANGED_WHEN WHERE ([GUID] = @Original_GUID) AND ([USER_ID] = @Original_USER_ID) AND ([ENTITY_ID] = @Original_ENTITY_ID) AND ([EDIT_REC] = @Original_EDIT_REC) AND ([ADD_REC] = @Original_ADD_REC) AND ([DELETE_REC] = @Original_DELETE_REC) AND ([ADD_DOC] = @Original_ADD_DOC) AND ([READ_ONLY_DOC] = @Original_READ_ONLY_DOC) AND ([DELETE_DOC] = @Original_DELETE_DOC) AND ([FILES_VISIBLE] = @Original_FILES_VISIBLE) AND (@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND (@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)));
 SELECT GUID, USER_ID, ENTITY_ID, EDIT_REC, ADD_REC, DELETE_REC, ADD_DOC, READ_ONLY_DOC, DELETE_DOC, FILES_VISIBLE, ADDED_WHEN, CHANGED_WHEN FROM TBPMO_RIGHT_USER WHERE (GUID = @GUID)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@USER_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="USER_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -3424,7 +3424,7 @@ ORDER BY GUID DESC</CommandText>
               <DbSource ConnectionRef="DD_DMSConnectionString (MySettings)" DbObjectName="DD_ECM_RENOLIT.dbo.TBPMO_APPOINTMENTS" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [TBPMO_APPOINTMENTS] WHERE (([UniqueID] = @Original_UniqueID) AND ((@IsNull_Type = 1 AND [Type] IS NULL) OR ([Type] = @Original_Type)) AND ((@IsNull_StartDate = 1 AND [StartDate] IS NULL) OR ([StartDate] = @Original_StartDate)) AND ((@IsNull_EndDate = 1 AND [EndDate] IS NULL) OR ([EndDate] = @Original_EndDate)) AND ((@IsNull_AllDay = 1 AND [AllDay] IS NULL) OR ([AllDay] = @Original_AllDay)) AND ((@IsNull_Subject = 1 AND [Subject] IS NULL) OR ([Subject] = @Original_Subject)) AND ((@IsNull_Location = 1 AND [Location] IS NULL) OR ([Location] = @Original_Location)) AND ((@IsNull_Status = 1 AND [Status] IS NULL) OR ([Status] = @Original_Status)) AND ((@IsNull_Label = 1 AND [Label] IS NULL) OR ([Label] = @Original_Label)) AND ((@IsNull_ResourceID = 1 AND [ResourceID] IS NULL) OR ([ResourceID] = @Original_ResourceID)))</CommandText>
+                    <CommandText>DELETE FROM [TBPMO_APPOINTMENTS] WHERE ([UniqueID] = @Original_UniqueID) AND (@IsNull_Type = 1 AND [Type] IS NULL) OR ([Type] = @Original_Type)) AND (@IsNull_StartDate = 1 AND [StartDate] IS NULL) OR ([StartDate] = @Original_StartDate)) AND (@IsNull_EndDate = 1 AND [EndDate] IS NULL) OR ([EndDate] = @Original_EndDate)) AND (@IsNull_AllDay = 1 AND [AllDay] IS NULL) OR ([AllDay] = @Original_AllDay)) AND (@IsNull_Subject = 1 AND [Subject] IS NULL) OR ([Subject] = @Original_Subject)) AND (@IsNull_Location = 1 AND [Location] IS NULL) OR ([Location] = @Original_Location)) AND (@IsNull_Status = 1 AND [Status] IS NULL) OR ([Status] = @Original_Status)) AND (@IsNull_Label = 1 AND [Label] IS NULL) OR ([Label] = @Original_Label)) AND (@IsNull_ResourceID = 1 AND [ResourceID] IS NULL) OR ([ResourceID] = @Original_ResourceID)))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_UniqueID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="UniqueID" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_Type" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Type" SourceColumnNullMapping="true" SourceVersion="Original" />
@@ -3482,7 +3482,7 @@ FROM            TBPMO_APPOINTMENTS AS T INNER JOIN
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [TBPMO_APPOINTMENTS] SET [Type] = @Type, [StartDate] = @StartDate, [EndDate] = @EndDate, [AllDay] = @AllDay, [Subject] = @Subject, [Location] = @Location, [Description] = @Description, [Status] = @Status, [Label] = @Label, [ResourceID] = @ResourceID, [ResourceIDs] = @ResourceIDs, [ReminderInfo] = @ReminderInfo, [RecurrenceInfo] = @RecurrenceInfo, [CustomField1] = @CustomField1, [CustomField2] = @CustomField2 WHERE (([UniqueID] = @Original_UniqueID) AND ((@IsNull_Type = 1 AND [Type] IS NULL) OR ([Type] = @Original_Type)) AND ((@IsNull_StartDate = 1 AND [StartDate] IS NULL) OR ([StartDate] = @Original_StartDate)) AND ((@IsNull_EndDate = 1 AND [EndDate] IS NULL) OR ([EndDate] = @Original_EndDate)) AND ((@IsNull_AllDay = 1 AND [AllDay] IS NULL) OR ([AllDay] = @Original_AllDay)) AND ((@IsNull_Subject = 1 AND [Subject] IS NULL) OR ([Subject] = @Original_Subject)) AND ((@IsNull_Location = 1 AND [Location] IS NULL) OR ([Location] = @Original_Location)) AND ((@IsNull_Status = 1 AND [Status] IS NULL) OR ([Status] = @Original_Status)) AND ((@IsNull_Label = 1 AND [Label] IS NULL) OR ([Label] = @Original_Label)) AND ((@IsNull_ResourceID = 1 AND [ResourceID] IS NULL) OR ([ResourceID] = @Original_ResourceID)));
+                    <CommandText>UPDATE [TBPMO_APPOINTMENTS] SET [Type] = @Type, [StartDate] = @StartDate, [EndDate] = @EndDate, [AllDay] = @AllDay, [Subject] = @Subject, [Location] = @Location, [Description] = @Description, [Status] = @Status, [Label] = @Label, [ResourceID] = @ResourceID, [ResourceIDs] = @ResourceIDs, [ReminderInfo] = @ReminderInfo, [RecurrenceInfo] = @RecurrenceInfo, [CustomField1] = @CustomField1, [CustomField2] = @CustomField2 WHERE ([UniqueID] = @Original_UniqueID) AND (@IsNull_Type = 1 AND [Type] IS NULL) OR ([Type] = @Original_Type)) AND (@IsNull_StartDate = 1 AND [StartDate] IS NULL) OR ([StartDate] = @Original_StartDate)) AND (@IsNull_EndDate = 1 AND [EndDate] IS NULL) OR ([EndDate] = @Original_EndDate)) AND (@IsNull_AllDay = 1 AND [AllDay] IS NULL) OR ([AllDay] = @Original_AllDay)) AND (@IsNull_Subject = 1 AND [Subject] IS NULL) OR ([Subject] = @Original_Subject)) AND (@IsNull_Location = 1 AND [Location] IS NULL) OR ([Location] = @Original_Location)) AND (@IsNull_Status = 1 AND [Status] IS NULL) OR ([Status] = @Original_Status)) AND (@IsNull_Label = 1 AND [Label] IS NULL) OR ([Label] = @Original_Label)) AND (@IsNull_ResourceID = 1 AND [ResourceID] IS NULL) OR ([ResourceID] = @Original_ResourceID)));
 SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Description, Status, Label, ResourceID, ResourceIDs, ReminderInfo, RecurrenceInfo, CustomField1, CustomField2 FROM TBPMO_APPOINTMENTS WHERE (UniqueID = @UniqueID)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Type" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Type" SourceColumnNullMapping="false" SourceVersion="Current" />

app/DD-Record-Organizer/DD_DMSDataSetCalendar.xsd

@@ -12,7 +12,7 @@
               <DbSource ConnectionRef="DD_DMSConnectionString (MySettings)" DbObjectName="DD_DMS.dbo.TBPMO_APPOINTMENTS" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [TBPMO_APPOINTMENTS] WHERE (([UniqueID] = @Original_UniqueID) AND ((@IsNull_Type = 1 AND [Type] IS NULL) OR ([Type] = @Original_Type)) AND ((@IsNull_StartDate = 1 AND [StartDate] IS NULL) OR ([StartDate] = @Original_StartDate)) AND ((@IsNull_EndDate = 1 AND [EndDate] IS NULL) OR ([EndDate] = @Original_EndDate)) AND ((@IsNull_AllDay = 1 AND [AllDay] IS NULL) OR ([AllDay] = @Original_AllDay)) AND ((@IsNull_Subject = 1 AND [Subject] IS NULL) OR ([Subject] = @Original_Subject)) AND ((@IsNull_Location = 1 AND [Location] IS NULL) OR ([Location] = @Original_Location)) AND ((@IsNull_Status = 1 AND [Status] IS NULL) OR ([Status] = @Original_Status)) AND ((@IsNull_Label = 1 AND [Label] IS NULL) OR ([Label] = @Original_Label)) AND ((@IsNull_ResourceID = 1 AND [ResourceID] IS NULL) OR ([ResourceID] = @Original_ResourceID)))</CommandText>
+                    <CommandText>DELETE FROM [TBPMO_APPOINTMENTS] WHERE ([UniqueID] = @Original_UniqueID) AND (@IsNull_Type = 1 AND [Type] IS NULL) OR ([Type] = @Original_Type)) AND (@IsNull_StartDate = 1 AND [StartDate] IS NULL) OR ([StartDate] = @Original_StartDate)) AND (@IsNull_EndDate = 1 AND [EndDate] IS NULL) OR ([EndDate] = @Original_EndDate)) AND (@IsNull_AllDay = 1 AND [AllDay] IS NULL) OR ([AllDay] = @Original_AllDay)) AND (@IsNull_Subject = 1 AND [Subject] IS NULL) OR ([Subject] = @Original_Subject)) AND (@IsNull_Location = 1 AND [Location] IS NULL) OR ([Location] = @Original_Location)) AND (@IsNull_Status = 1 AND [Status] IS NULL) OR ([Status] = @Original_Status)) AND (@IsNull_Label = 1 AND [Label] IS NULL) OR ([Label] = @Original_Label)) AND (@IsNull_ResourceID = 1 AND [ResourceID] IS NULL) OR ([ResourceID] = @Original_ResourceID)))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_UniqueID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="UniqueID" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_Type" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Type" SourceColumnNullMapping="true" SourceVersion="Original" />
@@ -68,7 +68,7 @@ FROM            TBPMO_APPOINTMENTS</CommandText>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [TBPMO_APPOINTMENTS] SET [Type] = @Type, [StartDate] = @StartDate, [EndDate] = @EndDate, [AllDay] = @AllDay, [Subject] = @Subject, [Location] = @Location, [Description] = @Description, [Status] = @Status, [Label] = @Label, [ResourceID] = @ResourceID, [ResourceIDs] = @ResourceIDs, [ReminderInfo] = @ReminderInfo, [RecurrenceInfo] = @RecurrenceInfo, [CustomField1] = @CustomField1, [CustomField2] = @CustomField2 WHERE (([UniqueID] = @Original_UniqueID) AND ((@IsNull_Type = 1 AND [Type] IS NULL) OR ([Type] = @Original_Type)) AND ((@IsNull_StartDate = 1 AND [StartDate] IS NULL) OR ([StartDate] = @Original_StartDate)) AND ((@IsNull_EndDate = 1 AND [EndDate] IS NULL) OR ([EndDate] = @Original_EndDate)) AND ((@IsNull_AllDay = 1 AND [AllDay] IS NULL) OR ([AllDay] = @Original_AllDay)) AND ((@IsNull_Subject = 1 AND [Subject] IS NULL) OR ([Subject] = @Original_Subject)) AND ((@IsNull_Location = 1 AND [Location] IS NULL) OR ([Location] = @Original_Location)) AND ((@IsNull_Status = 1 AND [Status] IS NULL) OR ([Status] = @Original_Status)) AND ((@IsNull_Label = 1 AND [Label] IS NULL) OR ([Label] = @Original_Label)) AND ((@IsNull_ResourceID = 1 AND [ResourceID] IS NULL) OR ([ResourceID] = @Original_ResourceID)));
+                    <CommandText>UPDATE [TBPMO_APPOINTMENTS] SET [Type] = @Type, [StartDate] = @StartDate, [EndDate] = @EndDate, [AllDay] = @AllDay, [Subject] = @Subject, [Location] = @Location, [Description] = @Description, [Status] = @Status, [Label] = @Label, [ResourceID] = @ResourceID, [ResourceIDs] = @ResourceIDs, [ReminderInfo] = @ReminderInfo, [RecurrenceInfo] = @RecurrenceInfo, [CustomField1] = @CustomField1, [CustomField2] = @CustomField2 WHERE ([UniqueID] = @Original_UniqueID) AND (@IsNull_Type = 1 AND [Type] IS NULL) OR ([Type] = @Original_Type)) AND (@IsNull_StartDate = 1 AND [StartDate] IS NULL) OR ([StartDate] = @Original_StartDate)) AND (@IsNull_EndDate = 1 AND [EndDate] IS NULL) OR ([EndDate] = @Original_EndDate)) AND (@IsNull_AllDay = 1 AND [AllDay] IS NULL) OR ([AllDay] = @Original_AllDay)) AND (@IsNull_Subject = 1 AND [Subject] IS NULL) OR ([Subject] = @Original_Subject)) AND (@IsNull_Location = 1 AND [Location] IS NULL) OR ([Location] = @Original_Location)) AND (@IsNull_Status = 1 AND [Status] IS NULL) OR ([Status] = @Original_Status)) AND (@IsNull_Label = 1 AND [Label] IS NULL) OR ([Label] = @Original_Label)) AND (@IsNull_ResourceID = 1 AND [ResourceID] IS NULL) OR ([ResourceID] = @Original_ResourceID)));
 SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Description, Status, Label, ResourceID, ResourceIDs, ReminderInfo, RecurrenceInfo, CustomField1, CustomField2 FROM TBPMO_APPOINTMENTS WHERE (UniqueID = @UniqueID)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Type" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Type" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -136,7 +136,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio
               <DbSource ConnectionRef="DD_DMSConnectionString (MySettings)" DbObjectName="DD_DMS.dbo.TBPMO_RESOURCES" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [dbo].[TBPMO_RESOURCES] WHERE (([UniqueID] = @Original_UniqueID) AND ([ResourceID] = @Original_ResourceID) AND ((@IsNull_ResourceName = 1 AND [ResourceName] IS NULL) OR ([ResourceName] = @Original_ResourceName)) AND ((@IsNull_Color = 1 AND [Color] IS NULL) OR ([Color] = @Original_Color)))</CommandText>
+                    <CommandText>DELETE FROM [dbo].[TBPMO_RESOURCES] WHERE ([UniqueID] = @Original_UniqueID) AND ([ResourceID] = @Original_ResourceID) AND (@IsNull_ResourceName = 1 AND [ResourceName] IS NULL) OR ([ResourceName] = @Original_ResourceName)) AND (@IsNull_Color = 1 AND [Color] IS NULL) OR ([Color] = @Original_Color)))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_UniqueID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="UniqueID" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_ResourceID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ResourceID" SourceColumnNullMapping="false" SourceVersion="Original" />
@@ -168,7 +168,7 @@ SELECT UniqueID, ResourceID, ResourceName, Color, Image, CustomField1 FROM TBPMO
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [dbo].[TBPMO_RESOURCES] SET [ResourceID] = @ResourceID, [ResourceName] = @ResourceName, [Color] = @Color, [Image] = @Image, [CustomField1] = @CustomField1 WHERE (([UniqueID] = @Original_UniqueID) AND ([ResourceID] = @Original_ResourceID) AND ((@IsNull_ResourceName = 1 AND [ResourceName] IS NULL) OR ([ResourceName] = @Original_ResourceName)) AND ((@IsNull_Color = 1 AND [Color] IS NULL) OR ([Color] = @Original_Color)));
+                    <CommandText>UPDATE [dbo].[TBPMO_RESOURCES] SET [ResourceID] = @ResourceID, [ResourceName] = @ResourceName, [Color] = @Color, [Image] = @Image, [CustomField1] = @CustomField1 WHERE ([UniqueID] = @Original_UniqueID) AND ([ResourceID] = @Original_ResourceID) AND (@IsNull_ResourceName = 1 AND [ResourceName] IS NULL) OR ([ResourceName] = @Original_ResourceName)) AND (@IsNull_Color = 1 AND [Color] IS NULL) OR ([Color] = @Original_Color)));
 SELECT UniqueID, ResourceID, ResourceName, Color, Image, CustomField1 FROM TBPMO_RESOURCES WHERE (UniqueID = @UniqueID)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@ResourceID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ResourceID" SourceColumnNullMapping="false" SourceVersion="Current" />

app/DD-Record-Organizer/DD_DMSDataSetMenuDesigner.xsd

@@ -12,7 +12,7 @@
               <DbSource ConnectionRef="DD_DMSConnectionString (MySettings)" DbObjectName="DD_ECM.dbo.TBPMO_MENU_FORM" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [dbo].[TBPMO_MENU_FORM] WHERE (([GUID] = @Original_GUID) AND ([MENU_ENTRY] = @Original_MENU_ENTRY) AND ((@IsNull_ICON_PATH = 1 AND [ICON_PATH] IS NULL) OR ([ICON_PATH] = @Original_ICON_PATH)) AND ([SEQUENCE] = @Original_SEQUENCE) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ([ADDED_WHEN] = @Original_ADDED_WHEN) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)))</CommandText>
+                    <CommandText>DELETE FROM [dbo].[TBPMO_MENU_FORM] WHERE ([GUID] = @Original_GUID) AND ([MENU_ENTRY] = @Original_MENU_ENTRY) AND (@IsNull_ICON_PATH = 1 AND [ICON_PATH] IS NULL) OR ([ICON_PATH] = @Original_ICON_PATH)) AND ([SEQUENCE] = @Original_SEQUENCE) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ([ADDED_WHEN] = @Original_ADDED_WHEN) AND (@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND (@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_MENU_ENTRY" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="MENU_ENTRY" SourceColumnNullMapping="false" SourceVersion="Original" />
@@ -51,7 +51,7 @@ SELECT GUID, MENU_ENTRY, ICON_PATH, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [dbo].[TBPMO_MENU_FORM] SET [MENU_ENTRY] = @MENU_ENTRY, [ICON_PATH] = @ICON_PATH, [SEQUENCE] = @SEQUENCE, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN WHERE (([GUID] = @Original_GUID) AND ([MENU_ENTRY] = @Original_MENU_ENTRY) AND ((@IsNull_ICON_PATH = 1 AND [ICON_PATH] IS NULL) OR ([ICON_PATH] = @Original_ICON_PATH)) AND ([SEQUENCE] = @Original_SEQUENCE) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ([ADDED_WHEN] = @Original_ADDED_WHEN) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)));
+                    <CommandText>UPDATE [dbo].[TBPMO_MENU_FORM] SET [MENU_ENTRY] = @MENU_ENTRY, [ICON_PATH] = @ICON_PATH, [SEQUENCE] = @SEQUENCE, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN WHERE ([GUID] = @Original_GUID) AND ([MENU_ENTRY] = @Original_MENU_ENTRY) AND (@IsNull_ICON_PATH = 1 AND [ICON_PATH] IS NULL) OR ([ICON_PATH] = @Original_ICON_PATH)) AND ([SEQUENCE] = @Original_SEQUENCE) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ([ADDED_WHEN] = @Original_ADDED_WHEN) AND (@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND (@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)));
 SELECT GUID, MENU_ENTRY, ICON_PATH, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_MENU_FORM WHERE (GUID = @GUID)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@MENU_ENTRY" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="MENU_ENTRY" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -95,7 +95,7 @@ SELECT GUID, MENU_ENTRY, ICON_PATH, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO
               <DbSource ConnectionRef="DD_DMSConnectionString (MySettings)" DbObjectName="DD_ECM.dbo.TBPMO_MENU_FORM_ENTRIES" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [dbo].[TBPMO_MENU_FORM_ENTRIES] WHERE (([GUID] = @Original_GUID) AND ([MENU_FORM_ID] = @Original_MENU_FORM_ID) AND ([FORM_ID] = @Original_FORM_ID) AND ((@IsNull_ICON_PATH = 1 AND [ICON_PATH] IS NULL) OR ([ICON_PATH] = @Original_ICON_PATH)) AND ([MENU_ENTRY] = @Original_MENU_ENTRY) AND ([SEQUENCE] = @Original_SEQUENCE) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ([ADDED_WHEN] = @Original_ADDED_WHEN) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)))</CommandText>
+                    <CommandText>DELETE FROM [dbo].[TBPMO_MENU_FORM_ENTRIES] WHERE ([GUID] = @Original_GUID) AND ([MENU_FORM_ID] = @Original_MENU_FORM_ID) AND ([FORM_ID] = @Original_FORM_ID) AND (@IsNull_ICON_PATH = 1 AND [ICON_PATH] IS NULL) OR ([ICON_PATH] = @Original_ICON_PATH)) AND ([MENU_ENTRY] = @Original_MENU_ENTRY) AND ([SEQUENCE] = @Original_SEQUENCE) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ([ADDED_WHEN] = @Original_ADDED_WHEN) AND (@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND (@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_MENU_FORM_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="MENU_FORM_ID" SourceColumnNullMapping="false" SourceVersion="Original" />
@@ -138,7 +138,7 @@ SELECT GUID, MENU_FORM_ID, FORM_ID, ICON_PATH, MENU_ENTRY, SEQUENCE, ADDED_WHO,
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [dbo].[TBPMO_MENU_FORM_ENTRIES] SET [MENU_FORM_ID] = @MENU_FORM_ID, [FORM_ID] = @FORM_ID, [ICON_PATH] = @ICON_PATH, [MENU_ENTRY] = @MENU_ENTRY, [SEQUENCE] = @SEQUENCE, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN WHERE (([GUID] = @Original_GUID) AND ([MENU_FORM_ID] = @Original_MENU_FORM_ID) AND ([FORM_ID] = @Original_FORM_ID) AND ((@IsNull_ICON_PATH = 1 AND [ICON_PATH] IS NULL) OR ([ICON_PATH] = @Original_ICON_PATH)) AND ([MENU_ENTRY] = @Original_MENU_ENTRY) AND ([SEQUENCE] = @Original_SEQUENCE) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ([ADDED_WHEN] = @Original_ADDED_WHEN) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)));
+                    <CommandText>UPDATE [dbo].[TBPMO_MENU_FORM_ENTRIES] SET [MENU_FORM_ID] = @MENU_FORM_ID, [FORM_ID] = @FORM_ID, [ICON_PATH] = @ICON_PATH, [MENU_ENTRY] = @MENU_ENTRY, [SEQUENCE] = @SEQUENCE, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN WHERE ([GUID] = @Original_GUID) AND ([MENU_FORM_ID] = @Original_MENU_FORM_ID) AND ([FORM_ID] = @Original_FORM_ID) AND (@IsNull_ICON_PATH = 1 AND [ICON_PATH] IS NULL) OR ([ICON_PATH] = @Original_ICON_PATH)) AND ([MENU_ENTRY] = @Original_MENU_ENTRY) AND ([SEQUENCE] = @Original_SEQUENCE) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ([ADDED_WHEN] = @Original_ADDED_WHEN) AND (@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND (@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)));
 SELECT GUID, MENU_FORM_ID, FORM_ID, ICON_PATH, MENU_ENTRY, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_MENU_FORM_ENTRIES WHERE (GUID = @GUID)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@MENU_FORM_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="MENU_FORM_ID" SourceColumnNullMapping="false" SourceVersion="Current" />

app/DD-Record-Organizer/DD_ECMAdmin.xsd

@@ -477,7 +477,7 @@ WHERE        (T2.GUID = @ENTITY_ID)</CommandText>
               <DbSource ConnectionRef="DD_DMSConnectionString (MySettings)" DbObjectName="DD_ECM_RENOLIT.dbo.TBPMO_DOCSEARCH_RESULTLIST_CONFIG" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [TBPMO_DOCSEARCH_RESULTLIST_CONFIG] WHERE (([GUID] = @Original_GUID) AND ([ENTITY_ID] = @Original_ENTITY_ID) AND ([LANGUAGE] = @Original_LANGUAGE) AND ([COLUMN_VIEW] = @Original_COLUMN_VIEW) AND ([HEADER_CAPTION] = @Original_HEADER_CAPTION) AND ([WIDTH] = @Original_WIDTH) AND ([TYPE_ID] = @Original_TYPE_ID) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)) AND ([VISIBLE] = @Original_VISIBLE) AND ([EDITABLE] = @Original_EDITABLE) AND ([CONFIG_COLUMNS] = @Original_CONFIG_COLUMNS) AND ([SEQUENCE] = @Original_SEQUENCE))</CommandText>
+                    <CommandText>DELETE FROM [TBPMO_DOCSEARCH_RESULTLIST_CONFIG] WHERE ([GUID] = @Original_GUID) AND ([ENTITY_ID] = @Original_ENTITY_ID) AND ([LANGUAGE] = @Original_LANGUAGE) AND ([COLUMN_VIEW] = @Original_COLUMN_VIEW) AND ([HEADER_CAPTION] = @Original_HEADER_CAPTION) AND ([WIDTH] = @Original_WIDTH) AND ([TYPE_ID] = @Original_TYPE_ID) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND (@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND (@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND (@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)) AND ([VISIBLE] = @Original_VISIBLE) AND ([EDITABLE] = @Original_EDITABLE) AND ([CONFIG_COLUMNS] = @Original_CONFIG_COLUMNS) AND ([SEQUENCE] = @Original_SEQUENCE))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_ENTITY_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ENTITY_ID" SourceColumnNullMapping="false" SourceVersion="Original" />
@@ -531,7 +531,7 @@ FROM            TBPMO_DOCSEARCH_RESULTLIST_CONFIG</CommandText>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [TBPMO_DOCSEARCH_RESULTLIST_CONFIG] SET [ENTITY_ID] = @ENTITY_ID, [LANGUAGE] = @LANGUAGE, [COLUMN_VIEW] = @COLUMN_VIEW, [HEADER_CAPTION] = @HEADER_CAPTION, [WIDTH] = @WIDTH, [TYPE_ID] = @TYPE_ID, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN, [VISIBLE] = @VISIBLE, [EDITABLE] = @EDITABLE, [CONFIG_COLUMNS] = @CONFIG_COLUMNS, [SEQUENCE] = @SEQUENCE WHERE (([GUID] = @Original_GUID) AND ([ENTITY_ID] = @Original_ENTITY_ID) AND ([LANGUAGE] = @Original_LANGUAGE) AND ([COLUMN_VIEW] = @Original_COLUMN_VIEW) AND ([HEADER_CAPTION] = @Original_HEADER_CAPTION) AND ([WIDTH] = @Original_WIDTH) AND ([TYPE_ID] = @Original_TYPE_ID) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)) AND ([VISIBLE] = @Original_VISIBLE) AND ([EDITABLE] = @Original_EDITABLE) AND ([CONFIG_COLUMNS] = @Original_CONFIG_COLUMNS) AND ([SEQUENCE] = @Original_SEQUENCE));
+                    <CommandText>UPDATE [TBPMO_DOCSEARCH_RESULTLIST_CONFIG] SET [ENTITY_ID] = @ENTITY_ID, [LANGUAGE] = @LANGUAGE, [COLUMN_VIEW] = @COLUMN_VIEW, [HEADER_CAPTION] = @HEADER_CAPTION, [WIDTH] = @WIDTH, [TYPE_ID] = @TYPE_ID, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN, [VISIBLE] = @VISIBLE, [EDITABLE] = @EDITABLE, [CONFIG_COLUMNS] = @CONFIG_COLUMNS, [SEQUENCE] = @SEQUENCE WHERE ([GUID] = @Original_GUID) AND ([ENTITY_ID] = @Original_ENTITY_ID) AND ([LANGUAGE] = @Original_LANGUAGE) AND ([COLUMN_VIEW] = @Original_COLUMN_VIEW) AND ([HEADER_CAPTION] = @Original_HEADER_CAPTION) AND ([WIDTH] = @Original_WIDTH) AND ([TYPE_ID] = @Original_TYPE_ID) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND (@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND (@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND (@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)) AND ([VISIBLE] = @Original_VISIBLE) AND ([EDITABLE] = @Original_EDITABLE) AND ([CONFIG_COLUMNS] = @Original_CONFIG_COLUMNS) AND ([SEQUENCE] = @Original_SEQUENCE));
 SELECT GUID, ENTITY_ID, LANGUAGE, COLUMN_VIEW, HEADER_CAPTION, WIDTH, TYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, VISIBLE, EDITABLE, CONFIG_COLUMNS, SEQUENCE FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE (GUID = @GUID)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@ENTITY_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ENTITY_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -650,7 +650,7 @@ FROM            TBPMO_DOCSEARCH_RESULTLIST_CONFIG</CommandText>
               <DbSource ConnectionRef="DD_DMSConnectionString (MySettings)" DbObjectName="DD_ECM_RENOLIT.dbo.TBPMO_LOG_ESSENTIALS" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="false" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [TBPMO_LOG_ESSENTIALS] WHERE (([GUID] = @Original_GUID))</CommandText>
+                    <CommandText>DELETE FROM [TBPMO_LOG_ESSENTIALS] WHERE ([GUID] = @Original_GUID))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
@@ -679,7 +679,7 @@ ORDER BY GUID DESC</CommandText>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [TBPMO_LOG_ESSENTIALS] SET [REFERENCE_KEY] = @REFERENCE_KEY, [REFERENCE_STRING] = @REFERENCE_STRING, [COMMENT] = @COMMENT, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN WHERE (([GUID] = @Original_GUID));
+                    <CommandText>UPDATE [TBPMO_LOG_ESSENTIALS] SET [REFERENCE_KEY] = @REFERENCE_KEY, [REFERENCE_STRING] = @REFERENCE_STRING, [COMMENT] = @COMMENT, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN WHERE ([GUID] = @Original_GUID));
 SELECT CONVERT (BIT, 0) AS Selection, GUID, REFERENCE_KEY, REFERENCE_STRING, COMMENT, ADDED_WHO, ADDED_WHEN FROM TBPMO_LOG_ESSENTIALS WHERE (GUID = @GUID) ORDER BY GUID DESC</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@REFERENCE_KEY" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="REFERENCE_KEY" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -710,7 +710,7 @@ SELECT CONVERT (BIT, 0) AS Selection, GUID, REFERENCE_KEY, REFERENCE_STRING, COM
               <DbSource ConnectionRef="DD_DMSConnectionString (MySettings)" DbObjectName="DD_ECM_RENOLIT.dbo.TBPMO_DOCRESULT_DROPDOWN_ITEMS" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [TBPMO_DOCRESULT_DROPDOWN_ITEMS] WHERE (([GUID] = @Original_GUID) AND ([CONFIG_ID] = @Original_CONFIG_ID) AND ([VALUE] = @Original_VALUE) AND ([SEQUENCE] = @Original_SEQUENCE) AND ([DEFAULT] = @Original_DEFAULT) AND ([COLOR] = @Original_COLOR) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)))</CommandText>
+                    <CommandText>DELETE FROM [TBPMO_DOCRESULT_DROPDOWN_ITEMS] WHERE ([GUID] = @Original_GUID) AND ([CONFIG_ID] = @Original_CONFIG_ID) AND ([VALUE] = @Original_VALUE) AND ([SEQUENCE] = @Original_SEQUENCE) AND ([DEFAULT] = @Original_DEFAULT) AND ([COLOR] = @Original_COLOR) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND (@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND (@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND (@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_CONFIG_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CONFIG_ID" SourceColumnNullMapping="false" SourceVersion="Original" />
@@ -757,7 +757,7 @@ WHERE        (CONFIG_ID = @CONFIG_ID)</CommandText>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [TBPMO_DOCRESULT_DROPDOWN_ITEMS] SET [CONFIG_ID] = @CONFIG_ID, [VALUE] = @VALUE, [SEQUENCE] = @SEQUENCE, [DEFAULT] = @DEFAULT, [COLOR] = @COLOR, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN WHERE (([GUID] = @Original_GUID) AND ([CONFIG_ID] = @Original_CONFIG_ID) AND ([VALUE] = @Original_VALUE) AND ([SEQUENCE] = @Original_SEQUENCE) AND ([DEFAULT] = @Original_DEFAULT) AND ([COLOR] = @Original_COLOR) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)));
+                    <CommandText>UPDATE [TBPMO_DOCRESULT_DROPDOWN_ITEMS] SET [CONFIG_ID] = @CONFIG_ID, [VALUE] = @VALUE, [SEQUENCE] = @SEQUENCE, [DEFAULT] = @DEFAULT, [COLOR] = @COLOR, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN WHERE ([GUID] = @Original_GUID) AND ([CONFIG_ID] = @Original_CONFIG_ID) AND ([VALUE] = @Original_VALUE) AND ([SEQUENCE] = @Original_SEQUENCE) AND ([DEFAULT] = @Original_DEFAULT) AND ([COLOR] = @Original_COLOR) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND (@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND (@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND (@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)));
 SELECT GUID, CONFIG_ID, VALUE, SEQUENCE, [DEFAULT], COLOR, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_DOCRESULT_DROPDOWN_ITEMS WHERE (GUID = @GUID)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@CONFIG_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CONFIG_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -807,7 +807,7 @@ SELECT GUID, CONFIG_ID, VALUE, SEQUENCE, [DEFAULT], COLOR, ADDED_WHO, ADDED_WHEN
               <DbSource ConnectionRef="DD_DMSConnectionString (MySettings)" DbObjectName="DD_ECM_RENOLIT.dbo.TBDD_GROUPS" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [TBDD_GROUPS] WHERE (([GUID] = @Original_GUID) AND ((@IsNull_NAME = 1 AND [NAME] IS NULL) OR ([NAME] = @Original_NAME)) AND ([ECM_FK_ID] = @Original_ECM_FK_ID) AND ([AD_SYNC] = @Original_AD_SYNC) AND ([INTERNAL] = @Original_INTERNAL) AND ([ACTIVE] = @Original_ACTIVE) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ((@IsNull_ADDED_WHO = 1 AND [ADDED_WHO] IS NULL) OR ([ADDED_WHO] = @Original_ADDED_WHO)) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)))</CommandText>
+                    <CommandText>DELETE FROM [TBDD_GROUPS] WHERE ([GUID] = @Original_GUID) AND (@IsNull_NAME = 1 AND [NAME] IS NULL) OR ([NAME] = @Original_NAME)) AND ([ECM_FK_ID] = @Original_ECM_FK_ID) AND ([AD_SYNC] = @Original_AD_SYNC) AND ([INTERNAL] = @Original_INTERNAL) AND ([ACTIVE] = @Original_ACTIVE) AND (@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND (@IsNull_ADDED_WHO = 1 AND [ADDED_WHO] IS NULL) OR ([ADDED_WHO] = @Original_ADDED_WHO)) AND (@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND (@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND (@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_NAME" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="NAME" SourceColumnNullMapping="true" SourceVersion="Original" />
@@ -856,7 +856,7 @@ FROM            TBDD_GROUPS</CommandText>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [TBDD_GROUPS] SET [NAME] = @NAME, [ECM_FK_ID] = @ECM_FK_ID, [AD_SYNC] = @AD_SYNC, [INTERNAL] = @INTERNAL, [ACTIVE] = @ACTIVE, [COMMENT] = @COMMENT, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN WHERE (([GUID] = @Original_GUID) AND ((@IsNull_NAME = 1 AND [NAME] IS NULL) OR ([NAME] = @Original_NAME)) AND ([ECM_FK_ID] = @Original_ECM_FK_ID) AND ([AD_SYNC] = @Original_AD_SYNC) AND ([INTERNAL] = @Original_INTERNAL) AND ([ACTIVE] = @Original_ACTIVE) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ((@IsNull_ADDED_WHO = 1 AND [ADDED_WHO] IS NULL) OR ([ADDED_WHO] = @Original_ADDED_WHO)) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)));
+                    <CommandText>UPDATE [TBDD_GROUPS] SET [NAME] = @NAME, [ECM_FK_ID] = @ECM_FK_ID, [AD_SYNC] = @AD_SYNC, [INTERNAL] = @INTERNAL, [ACTIVE] = @ACTIVE, [COMMENT] = @COMMENT, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN WHERE ([GUID] = @Original_GUID) AND (@IsNull_NAME = 1 AND [NAME] IS NULL) OR ([NAME] = @Original_NAME)) AND ([ECM_FK_ID] = @Original_ECM_FK_ID) AND ([AD_SYNC] = @Original_AD_SYNC) AND ([INTERNAL] = @Original_INTERNAL) AND ([ACTIVE] = @Original_ACTIVE) AND (@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND (@IsNull_ADDED_WHO = 1 AND [ADDED_WHO] IS NULL) OR ([ADDED_WHO] = @Original_ADDED_WHO)) AND (@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND (@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND (@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)));
 SELECT GUID, NAME, ECM_FK_ID, AD_SYNC, INTERNAL, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_GROUPS WHERE (GUID = @GUID)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />

app/DD-Record-Organizer/ModuleHelperMethods.vb

@@ -154,7 +154,7 @@ Module ModuleHelperMethods
             If ID > 0 Then
                 Return ID
             Else
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> es konnte keine ID für name geholt werden: " & SQL, False)
+                LOGGER.Debug("es konnte keine ID für name geholt werden: " & SQL, False)
                 Return -1
             End If
         Catch ex As Exception
@@ -302,7 +302,7 @@ Module ModuleHelperMethods
             frm.MdiParent = MAIN_FORM
             frm.Show()
         Catch ex As Exception
-            ClassLogger.Add("Error in OpenFormConstructor: " & ex.Message)
+            LOGGER.Warn("Error in OpenFormConstructor: " & ex.Message)
             MsgBox("Error in OpenFormConstructor: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
     End Sub
@@ -465,7 +465,7 @@ Module ModuleHelperMethods
             Dim EntitySQL As String
 
             If GRID_TYPE = frmConstructor_Main.GridType.Grid Then
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> GridType = Grid", False)
+                LOGGER.Debug("GridType = Grid", False)
                 EntitySQL = "SELECT T.* FROM " & ViewName & " T"
                 If IS_GEOData = True Then
 
@@ -486,7 +486,7 @@ Module ModuleHelperMethods
                     End If
                     ' GridControlMain.MainView = grvwGrid
                 Else
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Quick-View is configured", False)
+                    LOGGER.Debug("Quick-View is configured", False)
                 End If
             End If
 
@@ -509,13 +509,13 @@ Module ModuleHelperMethods
                     CURRENT_ENTITYSQL_WHERE = ""
                 End If
             Catch ex As Exception
-                ClassLogger.Add("Error in Get Entity SQL for User: " & vbNewLine & ex.Message, True)
+                LOGGER.Warn("Error in Get Entity SQL for User: " & vbNewLine & ex.Message)
                 MsgBox("Error in Get Entity SQL for User: " & vbNewLine & ex.Message)
             End Try
 
             Return EntitySQL
         Catch ex As Exception
-            ClassLogger.Add("Error in Get_Grid_Sql: " & vbNewLine & ex.Message, True)
+            LOGGER.Warn("Error in Get_Grid_Sql: " & vbNewLine & ex.Message)
             MsgBox("Error in Get_Grid_Sql: " & vbNewLine & ex.Message)
             Return Nothing
         End Try
@@ -532,7 +532,7 @@ Module ModuleHelperMethods
         End Sub
 
         Public Function Done() As Long
-            If LogErrorsOnly = True Then Return 0
+            If DEBUG = True Then Return 0
             stopwatch.Stop()
             Dim ts As TimeSpan = stopwatch.Elapsed
 
@@ -547,7 +547,7 @@ Module ModuleHelperMethods
             If timespan_ <> "00:00.00" Then
                 Dim message = String.Format("{0} || {1}", timespan_, label)
                 Console.WriteLine(message)
-                If LogErrorsOnly = False Then ClassLogger.Add(message, False)
+                LOGGER.Debug(message, False)
             End If
             Return stopwatch.ElapsedMilliseconds
         End Function

app/DD-Record-Organizer/ModuleMySettings.vb

@@ -2,6 +2,7 @@
 Imports System.Xml
 Imports DD_LIB_Standards
 Imports DevExpress.LookAndFeel
+Imports DigitalData.Modules.Logging
 
 Module ModuleMySettings
     Public PATH_FileExclusions As String = Path.Combine(Application.UserAppDataPath(), "FileExclusions.xml")
@@ -10,7 +11,7 @@ Module ModuleMySettings
     Public MyConnectionString As String = ""
     Public MyFormsDesign As String = ""
 
-    Public LogErrorsOnly As Boolean = True
+    Public DEBUG As Boolean = False
     Public Sett_TaskOverviewKeepInFront As Boolean = True
     Public Task_Popup_minutes As Integer = 2
     Public Sett_ConstructorStart As Integer
@@ -51,7 +52,8 @@ Module ModuleMySettings
     'Public USER_CLIENTS_COMMA_SEPERATED As String
     Public FWSCAN_started As Boolean = False
 
-
+    Public LOGCONFIG As LogConfig
+    Public LOGGER As Logger
 
     Dim rowresult As String = ""
     Public Function LoadFileExclusion()
@@ -112,10 +114,10 @@ Module ModuleMySettings
             Dim DT As DataTable
             'if file doesn't exist, create the file with its default xml table
             If Not File.Exists(ConfigPath) Then
-                ClassLogger.Add(">> ConfigFile was created in: " & ConfigPath, False)
+                LOGGER.Info("ConfigFile was created in: " & ConfigPath)
                 DT = CreateConfigTable()
                 DT.WriteXml(ConfigPath)
-                ClassLogger.Add(">> Defaultvalues were saved.", False)
+                LOGGER.Info("Defaultvalues were saved.")
             End If
             DT = GetTablefromXML(ConfigPath)
             If DT Is Nothing Then
@@ -141,7 +143,7 @@ Module ModuleMySettings
                                     PWplainText = wrapper.DecryptData(csb.Password)
                                     connstring = Row.Item("Value").ToString.Replace(csb.Password, PWplainText)
                                 Catch ex As Exception
-                                    ClassLogger.Add("- the Password '" & csb.Password & "' could not be decrypted", False)
+                                    LOGGER.Warn("- the Password '" & csb.Password & "' could not be decrypted")
                                     connstring = ""
                                 End Try
 
@@ -170,7 +172,7 @@ Module ModuleMySettings
                                     PWplainText = wrapper.DecryptData(csb.Password)
                                     connstring = Row.Item("Value").ToString.Replace(csb.Password, PWplainText)
                                 Catch ex As Exception
-                                    ClassLogger.Add("- the Password '" & csb.Password & "' could not be decrypted", False)
+                                    LOGGER.Warn("- the Password '" & csb.Password & "' could not be decrypted")
                                     connstring = ""
                                 End Try
 
@@ -186,8 +188,8 @@ Module ModuleMySettings
                     Case "MyLinkedServer"
                         ClassProxy.MyLinkedServer = Row.Item("Value")
                     Case "LogErrorsOnly"
-                        LogErrorsOnly = CBool(Row.Item("Value"))
+                        DEBUG = CBool(Row.Item("Value"))
-                        clsCURRENT.LOG_ERRORS_ONLY = LogErrorsOnly
+                        clsCURRENT.LOG_ERRORS_ONLY = DEBUG
                     Case "Sett_TaskOverviewKeepInFront"
                         Sett_TaskOverviewKeepInFront = CBool(Row.Item("Value"))
                     Case "WD_IndexDeleteDocs"
@@ -287,7 +289,7 @@ Module ModuleMySettings
 
         Catch ex As Exception
             MsgBox("Error in LoadMyConfig" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-            ClassLogger.Add("Error in LoadMyConfig: " & ex.Message, True)
+            LOGGER.Warn("Error in LoadMyConfig: " & ex.Message, True)
             Return False
         End Try
         Return True
@@ -300,8 +302,8 @@ Module ModuleMySettings
             Return DS.Tables(0)
         Catch ex As Exception
             MsgBox("Error in GetTablefromXML" & vbNewLine & ex.Message & vbNewLine & "ConfigPath: " & vbNewLine & path, MsgBoxStyle.Critical)
-            ClassLogger.Add("Error in GetTablefromXML: " & ex.Message, True)
+            LOGGER.Warn("Error in GetTablefromXML: " & ex.Message, True)
-            ClassLogger.Add(">> ConfigPath: " & ConfigPath, False)
+            LOGGER.Warn("ConfigPath: " & ConfigPath)
             Return Nothing
         End Try
 
@@ -385,7 +387,7 @@ Module ModuleMySettings
 
 
             table.AcceptChanges()
-            ClassLogger.Add(">> CreateConfigTable su...", False)
+            LOGGER.Info("CreateConfigTable su...")
             Return table
         Catch ex As Exception
             MsgBox("Error in CreateConfigTable" & vbNewLine & ex.Message, MsgBoxStyle.Critical)

app/DD-Record-Organizer/My Project/AssemblyInfo.vb

@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.5.0.6")>
+<Assembly: AssemblyVersion("2.7.0.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")> 
 
 <Assembly: NeutralResourcesLanguageAttribute("")> 

app/DD-Record-Organizer/My Project/Resources.resx

@@ -718,4 +718,7 @@
   <data name="NetworkPipes_32xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\NetworkPipes_32xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="folder_Open_16xMD" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\folder_Open_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

app/DD-Record-Organizer/My Project/Settings.Designer.vb

@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -266,6 +266,18 @@ Namespace My
                 Me("UserDocIDIndexname") = value
             End Set
         End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("False")>  _
+        Public Property SaveDocGridlayout() As Boolean
+            Get
+                Return CType(Me("SaveDocGridlayout"),Boolean)
+            End Get
+            Set
+                Me("SaveDocGridlayout") = value
+            End Set
+        End Property
     End Class
 End Namespace
 

app/DD-Record-Organizer/My Project/Settings.Settings

@@ -58,5 +58,8 @@
     <Setting Name="UserDocIDIndexname" Type="System.String" Scope="User">
       <Value Profile="(Default)">Dokument-ID</Value>
     </Setting>
+    <Setting Name="SaveDocGridlayout" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

app/DD-Record-Organizer/Strings/ControlProperties.Designer.vb

@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
      Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
     Friend Class ControlProperties

app/DD-Record-Organizer/frmChooseParentRecord.vb

@@ -63,7 +63,7 @@ Public Class frmChooseParentRecord
                     Try
                         ColorRow = Color.FromName(rowCellValue)
                     Catch ex As Exception
-                        ClassLogger.Add(">> RowBackColor '" & rowCellValue & "'could not be converted from name!", False)
+                        LOGGER.Warn("RowBackColor '" & rowCellValue & "'could not be converted from name!")
                         Exit Sub
                     End Try
                     'Dim c As Color = DirectCast(rowCellValue, Color)
@@ -71,7 +71,7 @@ Public Class frmChooseParentRecord
                     e.HighPriority = True
                 End If
             Catch ex As Exception
-                ClassLogger.Add(">> Unexpected Error in RowStyle: " & ex.Message, False)
+                LOGGER.Warn("Unexpected Error in RowStyle: " & ex.Message)
             End Try
         End If
 

app/DD-Record-Organizer/frmConfig_Basic.Designer.vb

@@ -22,8 +22,8 @@ Partial Class frmConfig_Basic
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConfig_Basic))
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.TabControl1 = New System.Windows.Forms.TabControl()
         Me.TabPage1 = New System.Windows.Forms.TabPage()
         Me.lblLinkedServer = New System.Windows.Forms.Label()
@@ -44,6 +44,7 @@ Partial Class frmConfig_Basic
         Me.txtPasswort = New System.Windows.Forms.TextBox()
         Me.BtnConnect = New System.Windows.Forms.Button()
         Me.TabPage2 = New System.Windows.Forms.TabPage()
+        Me.CheckBoxGridDocResult_BestFitColumns = New System.Windows.Forms.CheckBox()
         Me.Button4 = New System.Windows.Forms.Button()
         Me.GroupBox5 = New System.Windows.Forms.GroupBox()
         Me.Label11 = New System.Windows.Forms.Label()
@@ -83,7 +84,6 @@ Partial Class frmConfig_Basic
         Me.btncheckWDFolderexists = New System.Windows.Forms.Button()
         Me.txtwdFolder = New System.Windows.Forms.TextBox()
         Me.Label12 = New System.Windows.Forms.Label()
-        Me.CheckBoxGridDocResult_BestFitColumns = New System.Windows.Forms.CheckBox()
         Me.TabControl1.SuspendLayout()
         Me.TabPage1.SuspendLayout()
         Me.TabPage2.SuspendLayout()
@@ -246,6 +246,12 @@ Partial Class frmConfig_Basic
         Me.TabPage2.Name = "TabPage2"
         Me.TabPage2.UseVisualStyleBackColor = True
         '
+        'CheckBoxGridDocResult_BestFitColumns
+        '
+        resources.ApplyResources(Me.CheckBoxGridDocResult_BestFitColumns, "CheckBoxGridDocResult_BestFitColumns")
+        Me.CheckBoxGridDocResult_BestFitColumns.Name = "CheckBoxGridDocResult_BestFitColumns"
+        Me.CheckBoxGridDocResult_BestFitColumns.UseVisualStyleBackColor = True
+        '
         'Button4
         '
         Me.Button4.Image = Global.DD_Record_Organizer.My.Resources.Resources.email_go
@@ -356,14 +362,14 @@ Partial Class frmConfig_Basic
         '
         'Button1
         '
-        Me.Button1.Image = Global.DD_Record_Organizer.My.Resources.Resources.folder_go
+        Me.Button1.Image = Global.DD_Record_Organizer.My.Resources.Resources.folder_Open_16xLG
         resources.ApplyResources(Me.Button1, "Button1")
         Me.Button1.Name = "Button1"
         Me.Button1.UseVisualStyleBackColor = True
         '
         'btnApplicationFolder
         '
-        Me.btnApplicationFolder.Image = Global.DD_Record_Organizer.My.Resources.Resources.folder_go
+        Me.btnApplicationFolder.Image = Global.DD_Record_Organizer.My.Resources.Resources.folder_Open_16xLG
         resources.ApplyResources(Me.btnApplicationFolder, "btnApplicationFolder")
         Me.btnApplicationFolder.Name = "btnApplicationFolder"
         Me.btnApplicationFolder.UseVisualStyleBackColor = True
@@ -401,8 +407,8 @@ Partial Class frmConfig_Basic
         '
         'DataGridView1
         '
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.Aqua
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Aqua
-        Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
+        Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
         resources.ApplyResources(Me.DataGridView1, "DataGridView1")
         Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.DataGridView1.Name = "DataGridView1"
@@ -513,12 +519,6 @@ Partial Class frmConfig_Basic
         resources.ApplyResources(Me.Label12, "Label12")
         Me.Label12.Name = "Label12"
         '
-        'CheckBoxGridDocResult_BestFitColumns
-        '
-        resources.ApplyResources(Me.CheckBoxGridDocResult_BestFitColumns, "CheckBoxGridDocResult_BestFitColumns")
-        Me.CheckBoxGridDocResult_BestFitColumns.Name = "CheckBoxGridDocResult_BestFitColumns"
-        Me.CheckBoxGridDocResult_BestFitColumns.UseVisualStyleBackColor = True
-        '
         'frmConfig_Basic
         '
         resources.ApplyResources(Me, "$this")

app/DD-Record-Organizer/frmConfig_Basic.vb

@@ -2,6 +2,8 @@
 Imports System.Globalization
 Imports DevExpress.LookAndFeel
 Imports DD_LIB_Standards
+Imports System.IO
+
 Public Class frmConfig_Basic
     Private _Helper As New ClassHelper
     Dim formloaded As Boolean = False
@@ -139,7 +141,7 @@ Public Class frmConfig_Basic
             End Try
 
             Me.txtActualConnection.Text = constr
-            chkLogErrorsOnly.Checked = LogErrorsOnly
+            chkLogErrorsOnly.Checked = DEBUG
             'txtwdSearch_Count.Text = WDResultListCount.ToString
             txtTask_Popup.Text = Task_Popup_minutes.ToString
             CheckBoxGridDocResult_BestFitColumns.Checked = GridDocResult_BestFitColumns
@@ -181,13 +183,15 @@ Public Class frmConfig_Basic
     End Sub
 
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
-        Process.Start(ClassLogger.DateiSpeicherort)
+        Process.Start(LOGCONFIG.LogDirectory)
+
     End Sub
 
     Private Sub chkLogErrorsOnly_CheckedChanged(sender As Object, e As EventArgs) Handles chkLogErrorsOnly.CheckedChanged
-        LogErrorsOnly = chkLogErrorsOnly.Checked
+        DEBUG = chkLogErrorsOnly.Checked
-        SaveMySettingsValue("LogErrorsOnly", LogErrorsOnly, "ConfigMain")
+        SaveMySettingsValue("LogErrorsOnly", DEBUG, "ConfigMain")
-        clsCURRENT.LOG_ERRORS_ONLY = LogErrorsOnly
+        clsCURRENT.LOG_ERRORS_ONLY = DEBUG
+        LOGCONFIG.Debug = DEBUG
 
 
     End Sub
@@ -273,8 +277,8 @@ Public Class frmConfig_Basic
                         System.IO.Directory.CreateDirectory(mypath)
                     End If
                 Catch ex As Exception
-                    ClassLogger.Add(" >> Fehler beim Erstellen des Folderwatchordners: " & mypath, False)
+                    LOGGER.Warn("Fehler beim Erstellen des Folderwatchordners: " & mypath)
-                    ClassLogger.Add(" >> " & ex.Message, False)
+                    LOGGER.Warn("" & ex.Message)
                     MsgBox("Error in creating Hotfolder: " & mypath & vbNewLine & "Please check the rights!" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
                     Exit Sub
                 End Try

app/DD-Record-Organizer/frmConstructorDesigner.vb

@@ -307,7 +307,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.GUID NOT IN (SELECT USER_ID FROM TBPMO_CONSTR
         '        view = SQL_SELECT_EBENE1TextBox.Text.ToUpper.Replace("SELECT * FROM ", "")
         '        view = view.Trim
         '        Dim Sql = "SELECT name FROM sys.columns WHERE object_id = OBJECT_ID('" & view & "')"
-        '        If LogErrorsOnly = False Then ClassLogger.Add(" >> " & Sql, False)
+        '        LOGGER.Debug("" & Sql, False)
         '        Dim DT As DataTable = ClassDatabase.Return_Datatable(Sql)
         '        If DT IsNot Nothing Then
         '            COLUMN_NAME1ComboBox.Items.Clear()

app/DD-Record-Organizer/frmConstructor_Main.Designer.vb

@@ -39,6 +39,7 @@ Partial Class frmConstructor_Main
         Me.AuswertungAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.tsmiFilesearch = New System.Windows.Forms.ToolStripMenuItem()
         Me.tsmiNodedownSearch = New System.Windows.Forms.ToolStripMenuItem()
+        Me.EntitätsweiteSucheToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator12 = New System.Windows.Forms.ToolStripSeparator()
         Me.ToolStripSeparator24 = New System.Windows.Forms.ToolStripSeparator()
         Me.tsmiNodeRename = New System.Windows.Forms.ToolStripMenuItem()
@@ -167,6 +168,7 @@ Partial Class frmConstructor_Main
         Me.docCM_Open = New System.Windows.Forms.ToolStripMenuItem()
         Me.OrdnerÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.docCM_Copy = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ExportNachExcelToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator10 = New System.Windows.Forms.ToolStripSeparator()
         Me.docCMEntityWideSearch = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator20 = New System.Windows.Forms.ToolStripSeparator()
@@ -235,6 +237,7 @@ Partial Class frmConstructor_Main
         Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
         Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
+        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
         CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SplitContainerMain.SuspendLayout()
         CType(Me.SplitContainerTop, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -349,13 +352,12 @@ Partial Class frmConstructor_Main
         '
         'AuswertungAnzeigenToolStripMenuItem
         '
-        Me.AuswertungAnzeigenToolStripMenuItem.Image = Global.DD_Record_Organizer.My.Resources.Resources.Reports_collapsed_12995_32x
         Me.AuswertungAnzeigenToolStripMenuItem.Name = "AuswertungAnzeigenToolStripMenuItem"
         resources.ApplyResources(Me.AuswertungAnzeigenToolStripMenuItem, "AuswertungAnzeigenToolStripMenuItem")
         '
         'tsmiFilesearch
         '
-        Me.tsmiFilesearch.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsmiNodedownSearch})
+        Me.tsmiFilesearch.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsmiNodedownSearch, Me.EntitätsweiteSucheToolStripMenuItem})
         resources.ApplyResources(Me.tsmiFilesearch, "tsmiFilesearch")
         Me.tsmiFilesearch.Name = "tsmiFilesearch"
         '
@@ -365,6 +367,11 @@ Partial Class frmConstructor_Main
         Me.tsmiNodedownSearch.Name = "tsmiNodedownSearch"
         resources.ApplyResources(Me.tsmiNodedownSearch, "tsmiNodedownSearch")
         '
+        'EntitätsweiteSucheToolStripMenuItem
+        '
+        Me.EntitätsweiteSucheToolStripMenuItem.Name = "EntitätsweiteSucheToolStripMenuItem"
+        resources.ApplyResources(Me.EntitätsweiteSucheToolStripMenuItem, "EntitätsweiteSucheToolStripMenuItem")
+        '
         'ToolStripSeparator12
         '
         Me.ToolStripSeparator12.Name = "ToolStripSeparator12"
@@ -385,9 +392,9 @@ Partial Class frmConstructor_Main
         'tstxtRenameNode
         '
         Me.tstxtRenameNode.BackColor = System.Drawing.SystemColors.Control
-        resources.ApplyResources(Me.tstxtRenameNode, "tstxtRenameNode")
         Me.tstxtRenameNode.ForeColor = System.Drawing.SystemColors.ControlText
         Me.tstxtRenameNode.Name = "tstxtRenameNode"
+        resources.ApplyResources(Me.tstxtRenameNode, "tstxtRenameNode")
         '
         'tsmiNodeNew
         '
@@ -403,8 +410,8 @@ Partial Class frmConstructor_Main
         'tsmINewText
         '
         Me.tsmINewText.BackColor = System.Drawing.Color.Yellow
-        resources.ApplyResources(Me.tsmINewText, "tsmINewText")
         Me.tsmINewText.Name = "tsmINewText"
+        resources.ApplyResources(Me.tsmINewText, "tsmINewText")
         '
         'ToolStripSeparator15
         '
@@ -1235,7 +1242,7 @@ Partial Class frmConstructor_Main
         'ContextMenuStripResultFiles
         '
         Me.ContextMenuStripResultFiles.ImageScalingSize = New System.Drawing.Size(20, 20)
-        Me.ContextMenuStripResultFiles.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.docCM_Open, Me.OrdnerÖffnenToolStripMenuItem, Me.docCM_Copy, Me.ToolStripSeparator10, Me.docCMEntityWideSearch, Me.ToolStripSeparator20, Me.docCM_InWork, Me.docCM_linkRecord, Me.docCM_Showlinks, Me.docCM_RenameMain, Me.ToolStripSeparator22, Me.WindreamToolStripMenuItem, Me.ToolStripSeparator7, Me.docCM_CheckRights, Me.docCM_GetRights, Me.ToolStripSeparator8, Me.docCM_RemoveLink, Me.docCM_DeleteFile, Me.ToolStripSeparator9, Me.docCM_showGridSearch, Me.ToolStripSeparator16, Me.docCM_PropertiesFile, Me.ToolStripSeparator25, Me.ToolStripMenuItem1, Me.docCM_ResetView})
+        Me.ContextMenuStripResultFiles.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.docCM_Open, Me.OrdnerÖffnenToolStripMenuItem, Me.docCM_Copy, Me.ExportNachExcelToolStripMenuItem, Me.ToolStripSeparator10, Me.docCMEntityWideSearch, Me.ToolStripSeparator20, Me.docCM_InWork, Me.docCM_linkRecord, Me.docCM_Showlinks, Me.docCM_RenameMain, Me.ToolStripSeparator22, Me.WindreamToolStripMenuItem, Me.ToolStripSeparator7, Me.docCM_CheckRights, Me.docCM_GetRights, Me.ToolStripSeparator8, Me.docCM_RemoveLink, Me.docCM_DeleteFile, Me.ToolStripSeparator9, Me.docCM_showGridSearch, Me.ToolStripSeparator16, Me.docCM_PropertiesFile, Me.ToolStripSeparator25, Me.ToolStripMenuItem1, Me.docCM_ResetView})
         Me.ContextMenuStripResultFiles.Name = "ContextMenuStripResultFiles"
         resources.ApplyResources(Me.ContextMenuStripResultFiles, "ContextMenuStripResultFiles")
         '
@@ -1255,6 +1262,12 @@ Partial Class frmConstructor_Main
         Me.docCM_Copy.Name = "docCM_Copy"
         resources.ApplyResources(Me.docCM_Copy, "docCM_Copy")
         '
+        'ExportNachExcelToolStripMenuItem
+        '
+        Me.ExportNachExcelToolStripMenuItem.Image = Global.DD_Record_Organizer.My.Resources.Resources.Excel_25ixel
+        Me.ExportNachExcelToolStripMenuItem.Name = "ExportNachExcelToolStripMenuItem"
+        resources.ApplyResources(Me.ExportNachExcelToolStripMenuItem, "ExportNachExcelToolStripMenuItem")
+        '
         'ToolStripSeparator10
         '
         Me.ToolStripSeparator10.Name = "ToolStripSeparator10"
@@ -1302,8 +1315,8 @@ Partial Class frmConstructor_Main
         'CMDoc_TextBoxRenameFile
         '
         Me.CMDoc_TextBoxRenameFile.BackColor = System.Drawing.Color.Orange
-        resources.ApplyResources(Me.CMDoc_TextBoxRenameFile, "CMDoc_TextBoxRenameFile")
         Me.CMDoc_TextBoxRenameFile.Name = "CMDoc_TextBoxRenameFile"
+        resources.ApplyResources(Me.CMDoc_TextBoxRenameFile, "CMDoc_TextBoxRenameFile")
         '
         'DisplaynameUmbenennenToolStripMenuItem
         '
@@ -1314,8 +1327,8 @@ Partial Class frmConstructor_Main
         'CMDoc_TextBoxRenameDisplay
         '
         Me.CMDoc_TextBoxRenameDisplay.BackColor = System.Drawing.Color.DarkOrange
-        resources.ApplyResources(Me.CMDoc_TextBoxRenameDisplay, "CMDoc_TextBoxRenameDisplay")
         Me.CMDoc_TextBoxRenameDisplay.Name = "CMDoc_TextBoxRenameDisplay"
+        resources.ApplyResources(Me.CMDoc_TextBoxRenameDisplay, "CMDoc_TextBoxRenameDisplay")
         '
         'ToolStripSeparator22
         '
@@ -1510,43 +1523,42 @@ Partial Class frmConstructor_Main
         '
         resources.ApplyResources(Me.bbtniRefresh, "bbtniRefresh")
         Me.bbtniRefresh.Id = 1
-        Me.bbtniRefresh.ImageOptions.Image = CType(resources.GetObject("bbtniRefresh.ImageOptions.Image"), System.Drawing.Image)
+        Me.bbtniRefresh.ImageOptions.SvgImage = CType(resources.GetObject("bbtniRefresh.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.bbtniRefresh.ImageOptions.LargeImage = CType(resources.GetObject("bbtniRefresh.ImageOptions.LargeImage"), System.Drawing.Image)
         Me.bbtniRefresh.Name = "bbtniRefresh"
         '
         'bbtniGeodaten
         '
         resources.ApplyResources(Me.bbtniGeodaten, "bbtniGeodaten")
         Me.bbtniGeodaten.Id = 2
-        Me.bbtniGeodaten.ImageOptions.Image = CType(resources.GetObject("bbtniGeodaten.ImageOptions.Image"), System.Drawing.Image)
+        Me.bbtniGeodaten.ImageOptions.SvgImage = CType(resources.GetObject("bbtniGeodaten.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.bbtniGeodaten.ImageOptions.LargeImage = CType(resources.GetObject("bbtniGeodaten.ImageOptions.LargeImage"), System.Drawing.Image)
         Me.bbtniGeodaten.Name = "bbtniGeodaten"
+        Me.bbtniGeodaten.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing
         '
         'bbtniCopyRecord
         '
         resources.ApplyResources(Me.bbtniCopyRecord, "bbtniCopyRecord")
         Me.bbtniCopyRecord.Id = 3
-        Me.bbtniCopyRecord.ImageOptions.Image = CType(resources.GetObject("bbtniCopyRecord.ImageOptions.Image"), System.Drawing.Image)
+        Me.bbtniCopyRecord.ImageOptions.SvgImage = CType(resources.GetObject("bbtniCopyRecord.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.bbtniCopyRecord.ImageOptions.LargeImage = CType(resources.GetObject("bbtniCopyRecord.ImageOptions.LargeImage"), System.Drawing.Image)
         Me.bbtniCopyRecord.Name = "bbtniCopyRecord"
+        Me.bbtniCopyRecord.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing
         '
         'bbtniParentLink
         '
         resources.ApplyResources(Me.bbtniParentLink, "bbtniParentLink")
         Me.bbtniParentLink.Id = 5
-        Me.bbtniParentLink.ImageOptions.Image = CType(resources.GetObject("bbtniParentLink.ImageOptions.Image"), System.Drawing.Image)
+        Me.bbtniParentLink.ImageOptions.SvgImage = CType(resources.GetObject("bbtniParentLink.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.bbtniParentLink.ImageOptions.LargeImage = CType(resources.GetObject("bbtniParentLink.ImageOptions.LargeImage"), System.Drawing.Image)
         Me.bbtniParentLink.Name = "bbtniParentLink"
         Me.bbtniParentLink.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText
+        Me.bbtniParentLink.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing
         '
         'bbtniWFTask
         '
         resources.ApplyResources(Me.bbtniWFTask, "bbtniWFTask")
         Me.bbtniWFTask.Id = 6
-        Me.bbtniWFTask.ImageOptions.Image = CType(resources.GetObject("bbtniWFTask.ImageOptions.Image"), System.Drawing.Image)
+        Me.bbtniWFTask.ImageOptions.SvgImage = CType(resources.GetObject("bbtniWFTask.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.bbtniWFTask.ImageOptions.LargeImage = CType(resources.GetObject("bbtniWFTask.ImageOptions.LargeImage"), System.Drawing.Image)
         Me.bbtniWFTask.Name = "bbtniWFTask"
         Me.bbtniWFTask.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText
+        Me.bbtniWFTask.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing
         '
         'bbtniReclog
         '
@@ -1567,17 +1579,16 @@ Partial Class frmConstructor_Main
         '
         resources.ApplyResources(Me.bbtniclearCache, "bbtniclearCache")
         Me.bbtniclearCache.Id = 9
-        Me.bbtniclearCache.ImageOptions.Image = CType(resources.GetObject("bbtniclearCache.ImageOptions.Image"), System.Drawing.Image)
+        Me.bbtniclearCache.ImageOptions.SvgImage = CType(resources.GetObject("bbtniclearCache.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.bbtniclearCache.ImageOptions.LargeImage = CType(resources.GetObject("bbtniclearCache.ImageOptions.LargeImage"), System.Drawing.Image)
         Me.bbtniclearCache.Name = "bbtniclearCache"
         '
         'bbtniNewVariant2
         '
         resources.ApplyResources(Me.bbtniNewVariant2, "bbtniNewVariant2")
         Me.bbtniNewVariant2.Id = 11
-        Me.bbtniNewVariant2.ImageOptions.Image = CType(resources.GetObject("bbtniNewVariant2.ImageOptions.Image"), System.Drawing.Image)
+        Me.bbtniNewVariant2.ImageOptions.SvgImage = CType(resources.GetObject("bbtniNewVariant2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.bbtniNewVariant2.ImageOptions.LargeImage = CType(resources.GetObject("bbtniNewVariant2.ImageOptions.LargeImage"), System.Drawing.Image)
         Me.bbtniNewVariant2.Name = "bbtniNewVariant2"
+        Me.bbtniNewVariant2.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing
         '
         'bStaticItem1
         '
@@ -1687,6 +1698,11 @@ Partial Class frmConstructor_Main
         Me.RibbonPage2.Name = "RibbonPage2"
         resources.ApplyResources(Me.RibbonPage2, "RibbonPage2")
         '
+        'ContextMenuStrip1
+        '
+        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
+        resources.ApplyResources(Me.ContextMenuStrip1, "ContextMenuStrip1")
+        '
         'frmConstructor_Main
         '
         Me.Appearance.Options.UseFont = True
@@ -1972,4 +1988,7 @@ Partial Class frmConstructor_Main
     Friend WithEvents RepositoryItemProgressBar2 As DevExpress.XtraEditors.Repository.RepositoryItemProgressBar
     Friend WithEvents bsitmLoadEntity As DevExpress.XtraBars.BarStaticItem
     Friend WithEvents bsitmWFState As DevExpress.XtraBars.BarStaticItem
+    Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
+    Friend WithEvents ExportNachExcelToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents EntitätsweiteSucheToolStripMenuItem As ToolStripMenuItem
 End Class

app/DD-Record-Organizer/frmConstructor_Main.resx

@@ -168,7 +168,7 @@
     <value>Auswertung anzeigen</value>
   </data>
   <data name="tsmiNodedownSearch.Size" type="System.Drawing.Size, System.Drawing">
-    <value>237, 26</value>
+    <value>233, 22</value>
   </data>
   <data name="tsmiNodedownSearch.Text" xml:space="preserve">
     <value>Diesem Knoten untergeordnet</value>
@@ -177,6 +177,12 @@
   <data name="tsmiNodedownSearch.Visible" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
+  <data name="EntitätsweiteSucheToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>233, 22</value>
+  </data>
+  <data name="EntitätsweiteSucheToolStripMenuItem.Text" xml:space="preserve">
+    <value>Enitätssuche - "alle Dateien"</value>
+  </data>
   <data name="tsmiFilesearch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
@@ -204,9 +210,6 @@
   <data name="ToolStripSeparator24.Size" type="System.Drawing.Size, System.Drawing">
     <value>221, 6</value>
   </data>
-  <data name="tstxtRenameNode.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9pt</value>
-  </data>
   <data name="tstxtRenameNode.Size" type="System.Drawing.Size, System.Drawing">
     <value>200, 23</value>
   </data>
@@ -229,9 +232,6 @@
   <data name="SdsdToolStripMenuItem.Text" xml:space="preserve">
     <value>Knotentext:</value>
   </data>
-  <data name="tsmINewText.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9pt</value>
-  </data>
   <data name="tsmINewText.Size" type="System.Drawing.Size, System.Drawing">
     <value>152, 23</value>
   </data>
@@ -316,7 +316,7 @@
     <value>Suche Knoten</value>
   </data>
   <data name="cmsTreeView.Size" type="System.Drawing.Size, System.Drawing">
-    <value>225, 257</value>
+    <value>225, 235</value>
   </data>
   <data name="&gt;&gt;cmsTreeView.Name" xml:space="preserve">
     <value>cmsTreeView</value>
@@ -980,9 +980,6 @@
   <data name="BindingNavigatorPositionItem.AutoSize" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
-  <data name="BindingNavigatorPositionItem.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9pt</value>
-  </data>
   <data name="BindingNavigatorPositionItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>50, 23</value>
   </data>
@@ -2044,7 +2041,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;SplitContainerFORM.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>8</value>
   </data>
   <metadata name="ContextMenuStripResultFiles.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>591, 56</value>
@@ -2067,6 +2064,12 @@
   <data name="docCM_Copy.Text" xml:space="preserve">
     <value>Datei in Zwischenablage kopieren</value>
   </data>
+  <data name="ExportNachExcelToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>255, 26</value>
+  </data>
+  <data name="ExportNachExcelToolStripMenuItem.Text" xml:space="preserve">
+    <value>Export nach Excel</value>
+  </data>
   <data name="ToolStripSeparator10.Size" type="System.Drawing.Size, System.Drawing">
     <value>252, 6</value>
   </data>
@@ -2120,9 +2123,6 @@
   <data name="docCM_Showlinks.Text" xml:space="preserve">
     <value>Verknüpfungen anzeigen</value>
   </data>
-  <data name="CMDoc_TextBoxRenameFile.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9pt</value>
-  </data>
   <data name="CMDoc_TextBoxRenameFile.Size" type="System.Drawing.Size, System.Drawing">
     <value>152, 23</value>
   </data>
@@ -2135,9 +2135,6 @@
   <data name="NeuToolStripMenuItem.Text" xml:space="preserve">
     <value>Dateinamen umbenennen</value>
   </data>
-  <data name="CMDoc_TextBoxRenameDisplay.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9pt</value>
-  </data>
   <data name="CMDoc_TextBoxRenameDisplay.Size" type="System.Drawing.Size, System.Drawing">
     <value>152, 23</value>
   </data>
@@ -2289,7 +2286,7 @@
     <value>Ansicht zurücksetzen</value>
   </data>
   <data name="ContextMenuStripResultFiles.Size" type="System.Drawing.Size, System.Drawing">
-    <value>256, 494</value>
+    <value>256, 520</value>
   </data>
   <data name="&gt;&gt;ContextMenuStripResultFiles.Name" xml:space="preserve">
     <value>ContextMenuStripResultFiles</value>
@@ -2367,219 +2364,135 @@
     <value>221, 134</value>
   </metadata>
   <data name="bbtniRefresh.Caption" xml:space="preserve">
-    <value>Aktualisieren</value>
+    <value>Aktualisieren Datensätze</value>
   </data>
-  <data name="bbtniRefresh.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <assembly alias="DevExpress.Data.v19.2" name="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="bbtniRefresh.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAA1dEVYdFRpdGxlAEFycm93O1JlY3VycmVuY2U7UmVm
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        cmVzaDtVcGRhdGU7UmVsb2FkO0V4Y2hhbmdlhrRdSAAAANJJREFUOE+lkrENwkAQBI1EATRg0YFzirDI
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIkDAAAC77u/
-        SMgdIkeQ0wQlkJKZjH5o4tl9/Z5O6B6BCUY67d7tv33fpJT+IhR/wYr+fBctGMEEngXW1OjlvlrAAhxA
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        qnADGxAGrEAPGHICA1gXWD+AQtooYF8aGGK68zugkFG6TA7pmjlEDR7ovAn9SVo0LCwk8IyPJoeP18sS
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        dfUQfz2uiuIgzcPm4tswdd/APdPgj+qkO9+H2Of5Bj4Srkgh72vcAYXYnA8gfCQKidiC3FsLIPOe8lxC
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        8XtS8wL/7IdaesUzOwAAAABJRU5ErkJggg==
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-</value>
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
-  </data>
+        LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
-  <data name="bbtniRefresh.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
-    <value>
+        Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAA1dEVYdFRpdGxlAEFycm93O1JlY3VycmVuY2U7UmVm
+        bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iQ2hhbmdlVmlldyI+DQogICAgPHBh
-        cmVzaDtVcGRhdGU7UmVsb2FkO0V4Y2hhbmdlhrRdSAAAAc5JREFUWEfFlj1Ow1AQhFMEmnRIFCgUFCDl
+        dGggZD0iTTI0LjUsNy41QzIyLjMsNS4zLDE5LjMsNCwxNiw0QzEwLjEsNCw1LjEsOC4zLDQuMiwxNGg0
-        BNAlJ/BVUtImQkIcAW7gA9BwgHTUqSgouAK9mUHeaN9mXuwQ8VJ8Sjxvdnfkv+dB0zRHRYolkWJJpFgS
+        LjFjMC45LTMuNCw0LTYsNy43LTZjMi4yLDAsNC4yLDAuOSw1LjYsMi40TDE4LDE0ICAgaDUuN2g0LjFI
-        KZZEijmqh7cJmIMarMF3C/9T49pE1eaQYgRNx2AJPkDTAT30jlWviBQ9aHQLXkEc1AVrpqqnR4oGGpAL
+        MjhWNEwyNC41LDcuNXogTTE2LDI0Yy0yLjIsMC00LjItMC45LTUuNi0yLjRMMTQsMThIOC4yaC00SDR2
-        8AnUkC5WYGcIKRIUkqr9vQIW4h0swAyctfA/Na7FEDwT2cshRYIiDmcDH+IR3Cg/4Rp4ATHEUvnJlnBf
+        MTBsMy41LTMuNUM5LjcsMjYuNywxMi43LDI4LDE2LDI4YzUuOSwwLDEwLjgtNC4zLDExLjgtMTAgICBo
-        Pw9RYMMNC3ES/RF4RiCG4I0pn47kAMPPYYzDjcp7dwEvz0S8HHPlTQ5gyg039gnBe8LX1sq3+QND13Cj
+        LTQuMUMyMi44LDIxLjQsMTkuNywyNCwxNiwyNHoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQo8L3N2
-        Vwj4eGP6urXymbnvcCMJweOw3pfqoOIDQ/zWbxp4sMh3uzfPlC8C396XcasJgYEbiy9YKJ8C3q4QyZlL
+        Zz4L
-        ig2YuKv5Ij5S2RdQBN5ciIqPuvcmhQaM3HbjzseXy0j5PfCcAhWCw4fRnxx4UMAt1TcgDNH1Kn4C18CH
-        SE67R4oERfwGUNtwn83oC/gQcgaRooHCKeCWGkP0gSEugextSNGDBgzx1w+SO9XTI8UIGh3vk8yDpsf5
-        KP1PpFgSKZZEiiWRYjmawQ//5PL6OeAKogAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="bbtniGeodaten.Caption" xml:space="preserve">
     <value>Geodaten</value>
   </data>
-  <data name="bbtniGeodaten.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="bbtniGeodaten.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAbdEVYdFRpdGxlAE1vZGVsO0NvcHk7Q29weU1vZGVs
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        O4ktWcsAAAJgSURBVDhPjdFdSFNhHMfx1XQvbhokvdx00X3ddlEEQRB0WzeRvYBFkESRWVgstZpz5ZL5
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFIDAAAC77u/
-        Oo0CaysbFBlWSos2hroU1wsWmFA3WelyO9s82862s/36P4+4zqKLDnyQB5//9zx7jgpAgdFoVHc6g75u
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        11t0ud6RIDqcQbQz96ZgJ7bb437ap1mZ+TtQ2uGcQj4PkudyTG6ZTG7emQTt0xcC9KwialKi1WoNg54Z
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        SJIEIZrgwkICkWgKMTGDdDaHG30BFihTBtSW3oDP2vcGLb0TJACLYwzNjgDM5FrPGG4NBBESREiZHCw9
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        oyxgUAZKmx2jRcdWHp0du9Hux49fUaTSMpra/SxgVAY0VztZIA8xmeWWkjIXF2V+bJPNi2/zAhKSDFOb
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        lwXKlQFtfauXvzGWyCLKiFkISxmOvfWs+SW+zC0iTv+7YPWwQIUyoDvf4uHHZQMRuqwI/Y1RRExl6XfL
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
-        ePZ6BqFwHIlUBi98n6HX6ytproSwy1eVnWp8jqycRyiaJhIWBInelsHcyCBmG2oKPpj3I9C6owgLGE6a
+        LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3
-        hiiQwzwNRuJpGk4jHEti9nIN4HVxKdd1DBzaDAgPufi0ma954PjFp8jQZf2MLH/vu8OfcODKSMEJ+znU
+        RDc7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7b3Bh
-        9W8p8n346J9Add0Tfttx9hUSEvaccWNCBOeeDmFf/SYsop8b/9rE18qArur0fd+R2sc4XPsI7qH3PNDw
+        Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tm
-        aoGr7p7gA86PO7lLD7byddfejbDuXm9jgdVETyrIGrLhfwK0by3R8G+pRI9uW5UDSruOrSuy/WBlGx9m
+        aWxsOiNGRkIxMTU7fQo8L3N0eWxlPg0KICA8ZyAvPg0KICA8ZyBpZD0iR2VvUG9pbnRNYXBzIj4NCiAg
-        zz8CKycyKpQrsLWW0D6V6jdzUIrq8TztCAAAAABJRU5ErkJggg==
+        ICA8cGF0aCBkPSJNMTYsMGMtMy4zLDAtNiwyLjctNiw2czYsMTAsNiwxMHM2LTYuNyw2LTEwUzE5LjMs
-</value>
+        MCwxNiwweiBNMTYsOGMtMS4xLDAtMi0wLjktMi0yczAuOS0yLDItMnMyLDAuOSwyLDIgICBTMTcuMSw4
-  </data>
+        LDE2LDh6IiBjbGFzcz0iUmVkIiAvPg0KICAgIDxwYXRoIGQ9Ik0yMy40LDguNmMtMC44LDEuOS0yLjEs
-  <data name="bbtniGeodaten.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        NC0zLjQsNS43djAuNVYxOXYxMC4ybC04LThWMTl2LTQuN2MtMS41LTEuOS0zLjEtNC40LTMuNy02LjZM
-    <value>
+        NCwxMnYyMGw4LThsOCw4bDgtOFY0ICAgTDIzLjQsOC42eiIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4N
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        Cjwvc3ZnPgs=
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAbdEVYdFRpdGxlAE1vZGVsO0NvcHk7Q29weU1vZGVs
-        O4ktWcsAAAhaSURBVFhHjZZ7UFXXFcYRFBB8v5LaiZM4k0wmbf/pdDqNiY1p0sRJ7WOSMa+mnbSxTmKT
-        ZqiCDqOgXtAQjALG2GhVCIhvMIhIEJAi4jM+iQooCvK478t987jw9Vv7nnMDgkz2zI99L/ec831r7bXX
-        PmEAhjBu3Dh9Ds87fKky7+vL4EwuI1fNlzhfRG7hRXxVcBE5nHMKvlVkZVev5X2j5V4yakvembAtubVh
-        nxN5ro6uFfowELlRmyNEfLjR3d0Lr68bTpcPZpsbza0OXKprw+mLzfhs23ED7x1DlIm6+vawjJ3VDzYw
-        cMh3uUljtEQsI9DXh95AP3oCfQp/V9BAp9sPk82DO/fs+E/+WfT3AxW1t5GaVZrC+yOJMvHp1sofbiAy
-        MjJciImJiZS09vOp3b2BID0BdGn4/N3weLthc3hpwIbMnBplwOPrRVlNI5I2FKVSLIpEEAloRAOjNMIj
-        IiJGC1FRUdEVtQ0IBALwd/coQUEi9/i6ggb42c5laGIG0r88oQz4uvuUidITN7Ei9eA6CkaTQSaGMxCe
-        mX2qMjOnFlm7apG56xQySHCuQcbOGmzaUYONnDfuOKkoO3kTbm8XbE4vbt21wpD1jTLQ09tPw2IigOKK
-        64hLyh9i4n4DEnmEiA83pOAk0k6nDyarC3cZ7fmr91BxqhFHT9TB6nDj1h0rVqYXq+vFBMuEtSJGAigq
-        u4Z/Jn4lJvSaGNbAaIlYhkQgdPf2KXz+XkbKVDv96LBQrNmG9O3/U0JF5ddxuPQKbt+zIO2LMiSkFGKZ
-        YCjE0rVCAQr5eyazSOEYIlkY1sCYTUyvDCXcQwM9fSy2ILLeLk83LDYvbjdbkLKlXBlwc60Ly+qwp+g8
-        GppMuHqzDRfqWnD+SovaktXnm3DqQpNuYPyIBmRdZejCauZa+rkEXdoyWDt9aGy2YtWGklDBiYmDR69g
-        d+EZtBntaDW7cK/Diea2Tpq14U6LDRk7qsXABCJNalgDkRu2Bw2IuBSRLi74BO59G+ug8Y4Fy1IPDyo4
-        NwtubxG748FT7AtOWDo9MDs8XDIPLHYPi7ZKDEx8kIFwEpW+jevKf/h7gqJKmKI6nq4eOFx+NLDgPko6
-        wCuHFlx+4Tlk76tWhWnl7rAwY9KsNnypDEwayUB0Gi/S0xoU5d5XwsTfQ3ppoAt32h2s+CNYvHw3FsXn
-        YdGyPLy3VMjF/iMXkbSpFB1mh8qWjYalWbETioHJIxpYv1VrJFq0IqgLy+zig5zEZOe+b7Hj8s12nLva
-        zGK7i+pzTag83YjqM7dYH8fQarSwXrxwuLvg5b1pW8vFwJSRDIxd90WlMiBi7oH4KE7cLEKZJQsWB3sC
-        d0S72Y0WKTYaqm+ysOisSEw7ipZ2M6/xsEt2qaVZ//lxMTCVyCE1rIGYlM0VNNB/n3BQVHAK3IqdjEpm
-        iU4EZJ2NPJDaTC42KjdWpB3B3VYTzCw+mzLQi9TNZWJgmmZAnbYDDUSQWENWOfpowEXxkKhHEyVOd3Du
-        lJk4dChipokOZsTOdU9IPcKzwcgMSSHyzOCSGjJLxcD0kQyMX83i6evrV4JKbKCIJuRwBWeJTB4exM8s
-        BJGsLTUUoOFuOw25YOFvXtZQMp9N4RlE2vGwBiYkfVbCLdWvCYuYJqh9toUEg1h0NHGzw89oA4hbfYj1
-        0Io2NiQTa8VDU9K4KPzQEAPaGE0mSvGIAT1CHRELivuDwiI2QNRkZ0ESWQIp1H+xR1xvaEaL0YF21oSL
-        ASR+WozY2NiZY8eOjZZ3jaDs90MMTFq+7mv1tvN9lJoIP5s7BYrpMDKj1cuG46dh7ndWvIUpd7o8KCz5
-        ljuDNWDt5OuaE45OF4rLLyM6Ono2xSeGh4ePoZ5039AQA5PjDYeVAVk3hYhrwhKpitbmh5HiHewFFmK1
-        833w6CHcSl6ChiSyagnqVy7BzZXv43pZFs5lzMXZjc/idPozqP1kDmrWPY1Ro0bFUG9QFsTRFDk+e3gS
-        6ikORSzCErGI2yjOyEXczIi/y9mOlvQE4EReiKasJFQteQb3yuMAx94Q7aXvoiTup2JgAvWk7kJDDEyV
-        4pGjWMRE1KiEg6Ii3k7aKC6d0ETxnTwB3zKU4c01pXh9dSkWJh/Da0kl2BQ/F39dNxt/SZmNdwTDY3h7
-        7aO4kDwDBYufkMqbRCTroSEGpn2cfECdhLp4UNhHYQ2rh0ct15oHzX+LLmNjaQPOehAi83gj/piwCLlV
-        78KK7BA7Kl7H7+JmKgN73nlMDEwmIQPqXYBM+2gVDbBtDhb1MeograTZ6ESHyY4/JRYj46wDm07bsbGW
-        L6Q1Nryx5hjeTH4UB+rnY3/Dy9hf/xL21f8WCxJj8eIHM5SB7FcfGZIB3cDUDxP3q74tncsrqEOIr2Na
-        WxbkDdhktuGV+AJ8Um3F+pNWpFZZYKiyKgMLV87C3hsvYs+NF5B/4zfYff15ZeC5v09D8eKHkf7CjAxq
-        jSNSA2onyB/ViN77966q91fsweIEsjwf/4jP52eZeezyyBX+FpeD3YdO4qWP92FNpRmrK8xIKjdh5XGz
-        MvDqikeQ99088hxy6+Yih4iBX/15MlJ/PT2LOlNIJBm0C+RLFJHqnE5+dB8zBzCL/GTekt1I/MaE5ceM
-        SDjWgfgSI+YtzsYf4n+MnGvPIvvaHOy6+rTi+Q/G42cLxm/mfdNINBG9QX1Avsg/ZV3EnY6Yup9YMv2p
-        36fjyQVpePKV9Xhifgoef9mAWXM+3PbLtybjF2+QhZPw89cmKp6aP04i18VDqVdD78k/BA7dqBiRQpJs
-        PaQxQ/su88NEMiezfJ9I5J7B4jKGE3oQ2hiYLSnegRkbLnNyjVw7JO1hYWFh/wecxwMOH7dYDAAAAABJ
-        RU5ErkJggg==
 </value>
   </data>
   <data name="bbtniCopyRecord.Caption" xml:space="preserve">
     <value>Record kopieren</value>
   </data>
-  <data name="bbtniCopyRecord.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="bbtniCopyRecord.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAldEVYdFRpdGxlAENvcHk7QmFycztSaWJib247U3Rh
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        bmRhcmQ7Q2xvbmVtDt9bAAAAb0lEQVQ4T+2OwQ2AIBAE6ckW700HlOaXIny4cgbIokE5w9NNJhC4HXAA
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAADACAAAC77u/
-        GkQEHfa8LjzflBUd6kXvvPcrS8yClI0ltfREjFGLt3PtDr0aQqiSEpNAc5WYBExJ3r8LOL9gkoBJ+fSD
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        s1OYJxiFywDcAUEvVDi/LQTFAAAAAElFTkSuQmCC
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-</value>
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-  </data>
+        Y2U9InByZXNlcnZlIiBpZD0iQ29weSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIg
-  <data name="bbtniCopyRecord.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        MzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cjwvc3R5
-    <value>
+        bGU+DQogIDxwYXRoIGQ9Ik0yMSwwSDlDOC40LDAsOCwwLjQsOCwxdjVIM0MyLjQsNiwyLDYuNCwyLDd2
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        MjJjMCwwLjYsMC40LDEsMSwxaDE4YzAuNiwwLDEtMC40LDEtMXYtNWg1YzAuNiwwLDEtMC40LDEtMVY3
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAldEVYdFRpdGxlAENvcHk7QmFycztSaWJib247U3Rh
+        ICBMMjEsMHogTTIwLDI4SDRWOGg0aDJoNHY1YzAsMC42LDAuNCwxLDEsMWg1djR2NHYyVjI4eiBNMjYs
-        bmRhcmQ7Q2xvbmVtDt9bAAAA50lEQVRYR+2TwQqDMAyGfT6fq1dRevfJxFNhD7EdsvysgukSp1vtBusH
+        MTJ2MTBoLTR2LTlsLTctN2gtNVYyaDRoNnY0djFjMCwwLjYsMC40LDEsMSwxaDVWMTJ6IiBjbGFzcz0i
-        P5K0id9BGyL6atRmyajNNM45OpjAaTmYfcp6tyis8BA/9oP7XdfdxnFsuUx3iVoUVt4RmOdZlSgmADSJ
+        QmxhY2siIC8+DQo8L3N2Zz4L
-        ogIgldgUwOCReO9pmiYeleBsTZS4QoLPxDtFkQ6+Avf7vqcQQuw80PYsEnwmvomPBbA4lUB/Ixe+kk8A
-        aBIWcSavANgrcZoA2CNxqgBYJLS/A2QXsDIMQ7wlwRmTR2ALa1cVqAJVoAr8l4AVpowAI/ZrEUUV+AmB
-        nFnvtqI2y4WaO7s+m1CnlB8XAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="bbtniParentLink.Caption" xml:space="preserve">
     <value>Ändere Parent-Verknüpfung</value>
   </data>
-  <data name="bbtniParentLink.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="bbtniParentLink.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAVdEVYdFRpdGxlAExpbms7SHlwZXJsaW5rOy1hYIsA
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        AADvSURBVDhPjZOxEYMwEATVAAkRmYugCQInTtwBFThwCZ4hcSMugHFz8q/nj3lkgQl2QM/d6SWklHM+
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABMDAAAC77u/
-        RN/3rTEZsz8HI1XFJSbs3JgDb2OoGiImiuazcTKePp6qJmGCxohmakAItXnLKEYXXoybv1MnbLsDF8HD
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        hXd/EiIznbX/AiRWCJ3I3KEtjayZtpkZ88tQgFjMqwCK/rE0EEIYoYQ38nwDrFCaEWvNGku3GGMAJyya
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        tdsKYebdAI4lQjaIMe9xt8fSFMGg2Tkcmklmvq3WXBI7uBqE/PyqPQjgVnExMIlDZlDLhMSrysZWDWty
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        +gCTbuWdr5DkwAAAAABJRU5ErkJggg==
+        Y2U9InByZXNlcnZlIiBpZD0iTGlua1RvUHJldmlvdXMiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpu
-</value>
+        ZXcgMCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5CbGFja3tmaWxsOiM3Mjcy
-  </data>
+        NzI7fQoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KPC9zdHlsZT4N
-  <data name="bbtniParentLink.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        CiAgPHBhdGggZD0iTTE2LDE2SDZ2LTZoMTBWMTZ6IE0zMiwxMEgyMnY2aDEwVjEweiIgY2xhc3M9Illl
-    <value>
+        bGxvdyIgLz4NCiAgPHBhdGggZD0iTTE0LDE2djExYzAsMC41LTAuNSwxLTEsMUgzYy0wLjUsMC0xLTAu
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        NS0xLTFWMTNjMC0wLjUsMC41LTEsMS0xaDN2Mkg0djEyaDhWMTZIMTR6IE0yOCwxNnYxMGgtOFYxNGgy
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAVdEVYdFRpdGxlAExpbms7SHlwZXJsaW5rOy1hYIsA
+        di0yaC0zICBjLTAuNSwwLTEsMC41LTEsMXYxNGMwLDAuNSwwLjUsMSwxLDFoMTBjMC41LDAsMS0wLjUs
-        AAG6SURBVFhHxZbBTQMxFETTQSpA4ozEKQVRSDqgD1oJndABiNsyD/lb399D0G7QcnjaeL49s+vYlg/L
+        MS0xVjE2SDI4eiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8cGF0aCBkPSJNMTAuOSwyLjlDMTIuNywxLjEs
-        svwrVtwTK+6JFffEirdyOp2exUV8tudZ3Iup7yTcikIIXwwv4r72Hxq3ooAc/iCO4km8Nu1cxwyNW5B5
+        MTUuMiwwLDE4LDBjNC44LDAsOC45LDMuNCw5LjgsOGgtMi4xYy0wLjktMy40LTQtNi03LjctNmMtMi4y
-        Dq81XgL9knUYGluR8RAOpc5MUPvMOgyNLch0CofSh7+D+vYZCOMCqzuHs9LfaJex0Wf7GtBgB1sMY76w
+        LDAtNC4yLDAuOS01LjYsMi40TDE2LDhIOFYwICBMMTAuOSwyLjl6IiBjbGFzcz0iQmx1ZSIgLz4NCjwv
-        h/NM4yL8OfsFk/ATMnCwzzF/FD1cfG+31v4OF9bXig4MDDEDQ7igNoSD87WiI0wKeQ0QzkzcJe1qOFjR
+        c3ZnPgs=
-        IRPC6vH6LiKs0sPBeYIVK83MhcCHmF7O+TismJFZDme15wUHhPcvDZyXw4qBjHp4aw9brT354iEcss81
-        rAgy+S2cmeA30z6EQ/a6hhVlkKc9THM4L9OPV9GDA+frmAQNzlsrm+bwaMPfrgEN5oswfqi1oNXBHq9r
-        mASZxvF6rLVW7+Fiqq9lEmQaM/BkakM41D5rmQSZxhrgGsVNhsvEquN1DZMgYxYZF8gIzPRwqGO3MAnN
-        nJeox+sQDnXsFqy4J1bcEyvuiRX3Yzl8ASZm2qsDOahEAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="bbtniWFTask.Caption" xml:space="preserve">
     <value>Erstelle Workflowtasks</value>
   </data>
-  <data name="bbtniWFTask.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="bbtniWFTask.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAYdEVYdFRpdGxlAEZsb3dMYXlvdXQ7TGF5b3V0OxNT
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        9LIAAAMQSURBVDhPXZJpSFRRFMcfitpiFvU5+lBqmfSlRRuXNKXciUrMJdPRgUBzyQzX1MoZDdEiiRbM
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAMAEAAAC77u/
-        SilNYTLLZcacTDMpyyxzC9PMxhmXQWd03IJ/574xix78OO/dc87/3nfun4uUyBSi3BcQ5TYgchn2HiGR
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        KziOM4kQyxT8es5fInLkEGbXvaS8MceKR3WLGJ9dxJhugUetnYe0qR9UYM6iir5V2jketW4eSu0CbdDA
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        8iZ0Ajn6J/TIyi+BKCaHJ5JHskLEGfEKwmgxelQzCBfLmYApR0dFr3oGQcIUsEe/9AuzjMV/WcLswhJm
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        CPsDx9Gl1JKAzCAgJKUeEhDFZkFwMIDwh8DVH/tdCCpmDSlZ16HSTMPO0QcxybnoGtUh7HI9EzDjwrNl
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        aB/R4Qsdiyl/GplG58gUymSf4XPsdFFSxjX8HNdgn6M3os9L8GFYg5ZBLU5d4k9gxvklSOVHEqtg4Cky
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
-        77SitOYzEi4UahPTC/BjjJodvBEcmYr7zz4iu7iNr/ONr2zgh0jPKsKcWEdYEJsO+wmLElLzMKyexF4H
+        ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD
-        L9judq80MTXbTLmNxAZiPbGGMOJCMp43hV6sw5XSdjxu6EZcWiHik3LxXTWBvQIvBIafmympfo8QURoe
+        MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
-        1naisrEPcVebEJj2tJkETLmTWXV0jXMYmtBBnH8XsfSfQ8px7KHm7bucpfeq3qF7WA137zC4Ec8UbzGk
+        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk
-        0SOm4CWbwWouJLOWBjOFVMktRCdkY3B0Evud/WjnFJzgSUZAWDJcPUKgntbD5VAwHlS3oOJFHxNYwwWT
+        aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp
-        QNvAONw8Q3kfjDG3raDnUTGoWTVlwMktgG6pmwms5YIyavBmYAKeR4WwtnWC1R92OsLKxgGWNgJY7hDA
+        c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41
-        gTyinJrFtu32uFleT/PqNQgEptegsV+D11/H0NynxqtegmLp805WsIVFWccgb6qt1na4UVaL1m8aROU1
+        O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7
-        GgQ8Y8obfc5KwRP/ZBkp2DoVWHhGP1IUV3XA1z8KtyvayCNdCL9YDw9apzyzALnJcKdr/4OtGy9H3h8E
+        ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp
-        u3/mGQY1c0a/AcvaUVe52efgAAAAAElFTkSuQmCC
+        c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJXb3JrZmxvd0RlZmlu
-</value>
+        aXRpb24iPg0KICAgIDxwYXRoIGQ9Ik0xNyw4SDlDOC40LDgsOCw3LjYsOCw3VjFjMC0wLjYsMC40LTEs
-  </data>
+        MS0xaDhjMC41LDAsMSwwLjQsMSwxdjZDMTgsNy42LDE3LjUsOCwxNyw4eiBNMTAsMjF2LTYgICBjMC0w
-  <data name="bbtniWFTask.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        LjYtMC40LTEtMS0xSDFjLTAuNiwwLTEsMC40LTEsMXY2YzAsMC41LDAuNCwxLDEsMWg4QzkuNiwyMiwx
-    <value>
+        MCwyMS41LDEwLDIxeiIgY2xhc3M9IkJsdWUiIC8+DQogICAgPGcgY2xhc3M9InN0MSI+DQogICAgICA8
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        cGF0aCBkPSJNNiwxMmgxMy4ybDItMmMwLDAtMC4xLDAtMC4xLDBoLTdWOGgtMnYySDVjLTAuNiwwLTEs
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAYdEVYdFRpdGxlAEZsb3dMYXlvdXQ7TGF5b3V0OxNT
+        MC40LTEsMXYzaDJWMTJ6IiBjbGFzcz0iQmxhY2siIC8+DQogICAgPC9nPg0KICAgIDxwYXRoIGQ9Ik00
-        9LIAAAifSURBVFhHpZdpUFRXFseZySTEMUZnKWerSVKTD/Nh5sPMh0xqKmOSKTNJjCJonBi3KMjiUlai
+        LDMwaDI2VjRMNCwzMHogTTI0LDI0aC01LjVsNS41LTUuNVYyNHoiIGNsYXNzPSJZZWxsb3ciIC8+DQog
-        sjTiLqANKovsahxZlEUUodmXZm262ZduFoUGmoZeWUYRnczyn3Ne92tsxJhUqPrVue9yzz3/e+9597x2
+        IDwvZz4NCjwvc3ZnPgs=
-        ob/vEc8RP7Dz/DeEfUS/x/tfeAY8hn2+Twh/zwUmKeRBKUrM0bhwO5naRCD1BSQ2yMnXlW0g9z2FAJGk
-        OfwT6tmXRfDiXZ7fG1WN/slH34rd56pBvot3n5Wjf2Le//lZ7CPbJz7b274RVezLu2EXcL4asjvTuP0s
-        +m1WRnYXBSbfJWwLuJ/Is4/JW5ApweYTvlJBgCshHMMLe0jATc0EUtvMuN5lRU7PBG4QeX3sNCW0ue96
-        lwVXWk240W2Fb6QwyTKeLIf7W4y41mFGjtqKG8St3kkBfs6m8RmdZlxuNtJYK3yklez74pwAWkWuegI1
-        g1NoHb2H5pEpNI1MEqK1M2yzHfop3Kzu50mWs20fnYJyeALKIUJrfRLq57mqB6aQ1WmB92lnAa58jryq
-        Ft00gsOSsc33CLb6HMY2xvswtUOwxXuOzTuZQ9jsFUyINhibvCTY5CnBpwS3P/UMsrEjCBu3B0FFIjJJ
-        gFd4OQtY5BCwK1KOHBLAK9xKAR79579OPPyOBB+NwJmkLKiGSUCHBZ5hzgJe9KOszKbzU5EAXuH0o3/D
-        Mvuvb8+DJwk4HIHTCdegGLTgBuXBtXYzPEMFAT90CPClpOCz4XPaExSBD9y98b77Thtr5/gb48Z42Vjj
-        hffWeDo4EBIJ/dR9mGYeCfiHSBEWn4GGu2ZaoAlJjeO43m7B9lNlTgIWcVby1lTdnRTOqXHQCsWARaDh
-        rsmO2WFbhqzILFPzJK+my1pxNU+O0LOXMHF/FlYKbLj3EAdDTiMsLl0Yn9luQKJiXBCQQTvw2clS9l3s
-        EMBZmdlpRYrSgGSmcYwG65Gk0JPjnBVJazXgYKxwEb1y7qIMoZGXYL33AOb7DzE+/QAHgsMReiEN9XdM
-        QvAExZggIFFhIAEWbD1eIgrgq9xlkVd4hbADHNwhwk5SIwuykUgr4Ilud9NZlnRjxcoNXielF2H55wxM
-        92ahn5zB/uAwnIpNRR0HbzMivn6MBIwjoYEgyzuw5dg8AZyVfDbXKRGvkeVEsVmL4GDDgnS6qPIouEpr
-        wdmUfBwPT/zKNH0f41MzGLHew76AkwiPS4Vq0AyZxkQ7ZSIfxmyzrWakUXvzsWKnI3B9xzuj4q9+2fh6
-        srAlRIbE7BaciM6l4En/M1DC8aqHzNPY/cVRSuAYJOe0wPtUiTB+4XmywfEo7txNSCwhfkIsX4CfET8n
-        fkm89ud33X2OhMZ/pTdPYVBPl1evDl67JXjlN38Iof+/TvzaPvYXT4HnXEY4aoHrvmh57Rdx9RC4UIfP
-        L9TPEVuLE1eUyJX3IupyAQ6djEPvoAEtmiHUNPdjh58EgScT6GruQXh6E/ZF1xDVNhtTuyC7z1bWUlzH
-        RbSYs7LH+vAJNJZZ9FlmMExbnFdWh0Mn4tAzMIZmNQVv6sd2vyB8HhILrWkS/eYZdBnpOCZnobXOQDvx
-        AN303G2ehdry0Im/H5JxDrxECEn40pbjxVTBqOJpqHrZyabngj4rmocsuHpbjuATsY7g1ao+fOYbiF+9
-        9vtjqbI2FPWYkUUVMZNo1U3QjsSjRj0CBSVrnobuAbrms2g+AXrdN9gEvCwKWLKZXovUFhPi6VX5kmwa
-        ZXye2kLZbqbg1ZAcj4Xmzhiauocgp+DbfPyxV3KOJ/nd/vMVuKgYRXTVMBLrR1Dbq8cqDz8qSoFIL6yF
-        4o4RhRojLtIrHF0zii9VRnwsEQQsdQjYdLQIV5tNiK3VI4YHKfWQa+idzypH0LEYdFNwVZcWVapeqo7+
-        kIRdQEKG8EHyx8s3VahW61DcpkVRywBu1qvxoYcvGpp74L33GILDU1DcOoj8jjHE1YzgEt0t64PyRQH8
-        Weby8sbDRbjSZESUPXiFmi6PzDIEhJyn4KNQdmpRqexBwJEYfLRuF1at87NBK13l7kvWVwj6obuPwAeE
-        qmsYDW0DkEZfxWYfCTJKm1DWPYacDiPWBd5mAfwm2AR8ElJEW2PA5cZRVNDK46+XIuBoFLr6dVB2DKKi
-        sQflCg0U7QPQ3B1H/5AJfSJao0DvoBE9zIBBQNmhRXFNN+TKPuTK6uibwB+Rl24hq2UM7gF5LOBHooCl
-        nJWX6YzkvVSxssuphEahs0+Hxo4BIXBZvQalDWTryFK7pE6Nklo1igW6nSiioEU1XYItrO4SSEkrpJ3y
-        xKm4DGQ26bH2oCDgxw4BG4ILKEnGUEnJ8tbKjXjz7fXEOry5guwKth74kx1H+y/uAm+I9q05uEwXyjuR
-        X9lBVfEcVm/wwZWCepR06ZHdZsBaf+cdWPaxJB+XSEBBl0E4/+K2IRRR4hRSUs1H1nwX5e1aJGc18CRv
-        sC1vpyRT3cEtRS8yq1rx3uodyC9Vwf2TXdgjkSKvsQ83W3WIqhxGcsMY3A7ectqBZeslvAMGRNKAiAot
-        pGVDxCDOEDarxZlShtpEYp0ObgdyeZLfuu3PRUKtDuElAwgt7BOErPxoB953247z/7iNwlYtrjaOQFox
-        hDPlI0hiAQecj2CZR2C+ICCiUkeMkAhnpHbEdjKVVfs2vs7nyauS0uSnSSxn+q4AKbJr6Aho1XHyYQrM
-        wYdpjE7wXTNPwFIPei1YAJPisOO2PvqIYJKJFHIWcTsovEqvurEAeub/J1HtL6YyLOs0oJCOM6V+lC4n
-        +hghkht4DvoqIlbvd86Bxe/sTK9aqGx+HW/vTOPfd8vZzvVzCc7Cu742+7SSzPHI11EL+NcqfyDyzcSq
-        eGseh8u0iNjH43gC9mMr+onjfjqv/fgzj+WPEY4rVMP5P8+/KezDE4i+4s/zZ/GYr4vL/wHaCaaAWRzc
-        IgAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="bbtniReclog.Caption" xml:space="preserve">
     <value>Record-Logs</value>
   </data>
-  <assembly alias="DevExpress.Data.v19.2" name="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
   <data name="bbtniReclog.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
@@ -2635,135 +2548,59 @@
   <data name="bbtniclearCache.Caption" xml:space="preserve">
     <value>Anwendungscache freigeben</value>
   </data>
-  <data name="bbtniclearCache.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="bbtniclearCache.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAADB0RVh0VGl0
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
-        bGUAQ2xlYXI7RXJhc2U7UmVtb3ZlO0JhcnM7UmliYm9uO0Zvcm1hdHRpbmc7m4RtlgAAAxFJREFUOE+F
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        kmtIk1EYx4+WiZWY4YcUCiKKSoowksqEstoUNISZUWQX+pCRWphSIPZBzTRcWlOHl7ZpzmneNrXVLLfK
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAH4FAAAC77u/
-        a5p3u4AQBYaoKc42d9P9e943AoWgF348h3PO8zvPOe/DlE3DhsrmUXAom0ZQwdE4jKeaIZSpiYYhKBoG
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IavtMzDGXAGw5TBZbT/F/3/FVb20m62m4UpBUVUPRaCsvheRsXKKH2C1L/FY7Is8VqKgouvfAkl5J0Ug
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        +oYCPyaNiI4vh8XqQLN+FGGX87Fgc8BsXUSerI0TuH1NvsoGTofy9IsEjIlL38HpBBR1PQi/UgJFbQ8a
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        W4chjMmD1jAKk8UO04IdKs0AJ3Dn3oFweX/qOOsIP8ZYllRPAidsjiW+kubWEZw4nwutfoQ/3Wi2wWxx
+        Y2U9InByZXNlcnZlIiBpZD0iU29ydF9feDI2X19GaWx0ZXIiIHN0eWxlPSJlbmFibGUtYmFja2dyb3Vu
-        4E3XGPpjY+59un4JOsGRdO46nIilS15hackJo8mG+peDOH4mBy/oZH3HF4REP4C6ZYgqsKFTIsV4YRYs
+        ZDpuZXcgMCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5CbHVle2ZpbGw6IzEx
-        3S/wMf02VIcCMkngxu6KtXAsOjE7b8XRqGwqe4QvWXhOjMlpIxQ1bRhTluNbXhpMumr8albArFOh714q
+        NzdENzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuQmxhY2t7ZmlsbDojNzI3MjcyO30KPC9zdHlsZT4N
-        JP47s9id+42wU/k/5yz8FX7RadM01ugGUFJpQJs4F2P3U2BUy2F8JsUcYe5/iyGRCHVBh8AS0+r53zQ1
+        CiAgPGcgaWQ9IkNsZWFyX0Zvcm1hdHMiPg0KICAgIDxwYXRoIGQ9Ik03LjksMTJjLTEuMiwwLTIuMS0w
-        u4BJYmpmAbNGC0xmC/Q1WnxOvYUZZQFm5A8xIxNjvvs1egWheH44CNnbtj1kMXGlrRcT5LhAxMTLkPlY
+        LjMtMi44LTFTNCw5LjMsNCw4LjJjMC0xLjMsMC40LTIuMywxLjEtM1M2LjksNCw4LjIsNGMxLjIsMCwy
-        i2pNN+5KW5FWO4quxhZMSjIwlZ+BuXdavA8Roi7gAFJ8/ST0BusItobwWIZXRJKq8E7FIIo7J1DQPgFD
+        LjEsMC4zLDIuOCwxICAgYzAuNywwLjcsMSwxLjYsMSwyLjljMCwxLjMtMC40LDIuMy0xLjEsM0MxMC4x
-        pRqzOjW6ggWo9N+HOO+NBbRvPeG6oqsiU57THPMQJtYj9+0PiA3jPMrBCSQkPIF8+x5cWre+iPZ4csln
+        LDExLjYsOS4xLDEyLDcuOSwxMnogTTE5LjgsNEw5LDIwSDYuMkwxNyw0SDE5Ljh6IE04LDUuOUM3LDUu
-        3agtlgt2hYs5gfuWI8l5olQNMlu+Q94zjoDLKuyOKsJ+v4ASWvfiktsPCli4y6qVgs3BqZyA6zRP38Cb
+        OSw2LjQsNi42LDYuNCw4LjEgICBjMCwxLjQsMC41LDIuMSwxLjYsMi4xQzksMTAuMiw5LjYsOS41LDku
-        En+RFDsiHmHryRxsCkzikjdw62EurkxIPXSSWCHw2ZvAvP2v/ZVw7+FN+BAbibWEaygtcYl/cGG/AQOZ
+        Niw4QzkuNiw2LjYsOS4xLDUuOSw4LDUuOXogTTE3LjksMjBjLTEuMiwwLTIuMS0wLjMtMi44LTFjLTAu
-        cJVTJpybAAAAAElFTkSuQmCC
+        Ny0wLjctMS4xLTEuNi0xLjEtMi44ICAgYzAtMS4zLDAuNC0yLjMsMS4xLTNjMC44LTAuNywxLjgtMS4x
-</value>
+        LDMtMS4xYzEuMiwwLDIuMiwwLjMsMi44LDFjMC43LDAuNywxLDEuNiwxLDIuOGMwLDEuMy0wLjQsMi4z
-  </data>
+        LTEuMSwzICAgQzIwLjEsMTkuNiwxOS4xLDIwLDE3LjksMjB6IE0xOC4xLDEzLjhjLTEuMSwwLTEuNiww
-  <data name="bbtniclearCache.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        LjctMS42LDIuMmMwLDEuNCwwLjUsMi4xLDEuNiwyLjFjMS4xLDAsMS42LTAuNywxLjYtMi4yICAgYzAt
-    <value>
+        MC43LTAuMS0xLjItMC40LTEuNkMxOC45LDE0LDE4LjYsMTMuOCwxOC4xLDEzLjh6IE0xNy41LDIySDJW
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAADB0RVh0VGl0
+        MmgyMnYxMy41bDAuNi0wLjZjMC40LTAuNCwwLjktMC43LDEuNC0wLjhWMWMwLTAuNS0wLjUtMS0xLTFI
-        bGUAQ2xlYXI7RXJhc2U7UmVtb3ZlO0JhcnM7UmliYm9uO0Zvcm1hdHRpbmc7m4RtlgAACZxJREFUWEeV
+        MSAgIEMwLjUsMCwwLDAuNSwwLDF2MjJjMCwwLjUsMC41LDEsMSwxaDE0LjVMMTcuNSwyMnoiIGNsYXNz
-        lnlU1dUWx3+mmSI5kVG5etWrVrZW/fNqvaanyQPrBpKiKAoKSA5pCghCECAyiygoyCSCyCAgiiEiKOpF
+        PSJCbGFjayIgLz4NCiAgICA8cGF0aCBkPSJNMjQuNywyOUwyMiwzMS43Yy0wLjQsMC40LTEuMiwwLjQt
-        UAQCB2YkBpm5giDI6PB9ex+5SHVb63nW+rDP797L/n7P+e2zfz+JxqTE9FJ5UkYFxpMoKEfC2WccSy9D
+        MS42LDBsLTQtNGMtMC40LTAuNC0wLjQtMS4yLDAtMS42bDIuNy0yLjdMMjQuNywyOXoiIGNsYXNzPSJC
-        PHOmDHFpZYg9U4rYtFLEnC5BVMqNbMo1mZjASQH8X/CYHE3Jnjx5QmA0PsHjx89HaFIRZ5tKvMBJVYmp
+        bHVlIiAvPg0KICAgIDxwYXRoIGQ9Ik0zMS43LDIybC02LjEsNi4xbC01LjYtNS42bDYuMS02LjFjMC40
-        gseUqNQSkWRg6NEY/YOjiPlDwQO+HhidDzwiOD7E8MhjBMUXcLZpxEROqkpMFTymRqTcFAZY8E5LJ3bs
+        LTAuNCwxLjItMC40LDEuNiwwbDQsNEMzMi4xLDIwLjgsMzIuMSwyMS41LDMxLjcsMjJ6IiBjbGFzcz0i
-        DMEC/W2w3RmKhuZO9I0KcXzGCHop9vaPYIgMBBzN42zqxHMbUAtLvo5HZIBFtjoEIjopC4PDD0XcaOMv
+        UmVkIiAvPg0KICA8L2c+DQo8L3N2Zz4L
-        RPr6WeypoPxqCWQr7HD/wQju0/Xg8CP4ReVytpcJYeB5xrTgxCJhoI+S6a52RFdPv9h6jjqGo0JED5FT
-        UIWVG31wrbhaXHf3jWCAdm53ePZ4A1yIY5SuXSqVrFki3WJMvpduGutLN1brS8WrFtPXZCAwLh8PHz0m
-        kYewdT1EK7+AvsERRCdmwdIpBN0PhtFDQpfzK7FivTfyiqrQQ2bv9Q4L+NZ5BF9gAzMIPgmTiBdH4TkX
-        5oTi1YulYiM9qYhZoSsVGsroY7pv/tF5GCEDPX3DqG9S0L0Px9dLbCiGoa5RIUTk1yqw3MIDV3+rFL/r
-        uj+MTsGQuHWu+zPZwCxCrcBIz6PGcRtqHLbiqqHMkz5jU2JnCg2/kwqWy6Rry76V8gwW0Ue0bXsO52Dk
-        4WMS4i0dFgkHhp4WWheJX8orh4G5O3ILK4WZzp4hIczxLtHbP4yIRFGEmrmGMu87+73QXyhHf4EcDf4e
-        kC/V8aLvphDCxIOr56Xc73WkXH1tupSk6d6hcnGUlEnFykZFLl4pwxJTN+QWVOAeXd/tHiSGoKDIdHQN
-        oPfBEM7KS3FWX3tfvb87ulPjoTjkB0X4HnSfikGt705k6i70Ji3uE8KEXFdLuiRbyPrSDLegLAwNPxar
-        GU9Wbin017jickG5MFVV2w4bOppaS6yw3TkU5b+3kZkB9PT2I8t7D+r27MK9k0fRHuyD9oPeaA/yQnug
-        J+4lRaLa0wmndeb7kJ4awXUx4ZzOf1hfmuninymOkoJW1iEYxPmcEugZO+PytXJhpv3eIH6yD0RE/Dmx
-        C+FxmfANTICiqxeVUeGo8XFBV2IU2gLc0ervhtZ9zC607nVFyx4X3I0NQ7mrPZK//nw3aXLDEibYwCxH
-        vzOi+3WQCAudu3wLuqucqPDKoOgZRBttM6Nn7ITG9m60d/WjRdGDw3FpKD0UitseTiQQjmbaaqZptwua
-        fJzR5O2EJq9f0OjpiEYPB3QmRaF8rxfivvjEd5wJabadd6o4Sm1dLDYI2UpHXLpaKsRbOwfG2O4SjrDY
-        TFp1H64UlCLNxRWVrg7oiAwmARJxdxDccfsZd3bZ446rHbEDDTtt0bzXDV0Zx1FtuwVXNv2AkOAjbIJr
-        QtKwcU8R7VUpxE2Hb0MLzVvuMrRiorK2DQcOpSA06lekObmgwnkH2sP2o8HFFg3OjA3qnZjtqP/FGvWO
-        Vqh3sESjtws60xJQZCBD7uLvUPRbNdKsbfjUTBcGLF2TRatt6WShZ4LNNG/mqOhHU0c/2jsf0Op7cD04
-        EKUO1mgN9EOdvSWxDXV2zFbU7mB+Qi2ttNZmMxrcHKA4GYvfvv8GOboy5FNh51qsR+ZSPWXjkmZvcUoU
-        q+YzL6Djxo2GIx/Fu/cH0dndj4673chMSMOtHdvQ4ueF361+JDYJaiyZjajZRmzdQKxHHe1KOxVmoZ4O
-        smXfIC/nFnLMLRDz7lv4+Q3NANLmOpBeNrM8LLewiYGFzVGs234U5tbRMLOKhqnlEazdFgX3gDTEnbgC
-        t4hsRGfXI496w+0fLQTVzCZm3VM2mqN6gzlq7azQGhOOfJkWLi1ahFz5DWSbrsORt9+E9atzDpAud03u
-        kOIP34tXiFcJzXG8QbxJvL/cMS408lIdCtsGkFXXi19TclFlsRZV65g1TzFnTFBjtRnNkUHIW7QAF3W0
-        kXPxBuRrzBDxj7nYoqERSPlmEy8R4uWF/ygfHmxGCbdOfr7PWelyIuBQ1u+42tSHM7e7x0hKkqPCxGiM
-        cuOVqN68Ho2h/sjVmo/zWtqQny/GBWNThM59Axtmz2JxjdHc4gFFiPGHxyfB7ZIdzjJ0TvYPOVcDed19
-        nCjrxMnSLpwsI0ZjXEwWSg0NBJXrzdGw3wc587/AuQVauJhZhPNGa3HwNU2YT58eRPl4l8fEfefO/eOb
-        y+hgA7wbM5c5JvkHnq1GZnU34q53IK64A/EU45XxukIQGZGBCrM11Irdkf3VZ8iYvxBZ6YXIXGGC/Zqv
-        wkRd/SDlm0Mo3xknrFNXlzw1X/uLAeXq1Zc6Ht/nf7oKqeVdiMhvQ6SgVXB4dK6MMWQo90AILn32Kc5+
-        tQDn0vKRsdwY++a8glXTpgVTPqW4eBBVGuhLJmpqktsrVHIqDHA9zLaNKMTxmwoEXW7CQSLociOCchpp
-        zrEJwTwnwq41IySnHqs9z8N3rRMyUq8h3WA1/DQ0sHyqGotzYY+JV+jrS4zRlKmSyywqBxUGePs1rELy
-        4ZfV8IwLDdibVY99jJg34EB2IwIu1GDZznQYOafheEYZArb6Yves2dCfMjWE8vBJ4qffU3FdXUmJweSX
-        JMcZdBJVGOAdmK61OTJoY3A+PNJr4XG2Fp7j8CL8yIhPehX07FJhYP8rEtJL8IN7BuYtDsCHcz4KpRx0
-        g5+Jl8tk0nj0X5ws2atTI/yTAR5cJHwC5nxpFhxi6n8FzqduEzVj0Z1MuaaUQMfqOBZbJyP+9E2YuqTh
-        vW/9MOODdWH0v68TfyvOfDfxRclWjd5hVRhQFiLfN81PVu0PXeUrh11yBVGJX1Kr4HjsOr7+MR6yLQmI
-        Tb0JY4dTeEd7N6a/b6YU5xb7t+LMNxMnSdunUJv5s4GFPyVzUJrgVbz28TK/sGUeF4QB6+gCfG4eDe0N
-        MYhJKcZKuxN4c4EHXn53bTj9ljvnmHiCfahKcUb7hYmS1Uv00z8b+HJjkvTFhmM8HW/i9Xn6u0M/Xn0E
-        HxlFYb75EezyOwbZpiP4wOAQpr1jwitn8bFtf2/mhyQySfBfwUSB1jhUGvi3Rbz0qVms9C/TGL4cfzu4
-        f1Prkt4i3h6F5/wZt9exo/bPmfOE2MJRIY6qUGlAxWATXJjKZwW30vFwwfJ3Qpx4jiFJ/wMhhagAk8Ug
-        eAAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="bbtniNewVariant2.Caption" xml:space="preserve">
     <value>Neue Variante</value>
   </data>
-  <data name="bbtniNewVariant2.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="bbtniNewVariant2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAbdEVYdFRpdGxlAE1vZGVsO0NvcHk7Q29weU1vZGVs
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        O4ktWcsAAAJgSURBVDhPjdFdSFNhHMfx1XQvbhokvdx00X3ddlEEQRB0WzeRvYBFkESRWVgstZpz5ZL5
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAB0DAAAC77u/
-        Oo0CaysbFBlWSos2hroU1wsWmFA3WelyO9s82862s/36P4+4zqKLDnyQB5//9zx7jgpAgdFoVHc6g75u
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        11t0ud6RIDqcQbQz96ZgJ7bb437ap1mZ+TtQ2uGcQj4PkudyTG6ZTG7emQTt0xcC9KwialKi1WoNg54Z
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        SJIEIZrgwkICkWgKMTGDdDaHG30BFihTBtSW3oDP2vcGLb0TJACLYwzNjgDM5FrPGG4NBBESREiZHCw9
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        oyxgUAZKmx2jRcdWHp0du9Hux49fUaTSMpra/SxgVAY0VztZIA8xmeWWkjIXF2V+bJPNi2/zAhKSDFOb
+        Y2U9InByZXNlcnZlIiBpZD0iQWRkUGFyYWdyYXBoVG9UYWJsZU9mQ29udGVudHMiIHN0eWxlPSJlbmFi
-        lwXKlQFtfauXvzGWyCLKiFkISxmOvfWs+SW+zC0iTv+7YPWwQIUyoDvf4uHHZQMRuqwI/Y1RRExl6XfL
+        bGUtYmFja2dyb3VuZDpuZXcgMCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5C
-        ePZ6BqFwHIlUBi98n6HX6ytproSwy1eVnWp8jqycRyiaJhIWBInelsHcyCBmG2oKPpj3I9C6owgLGE6a
+        bGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMx
-        hiiQwzwNRuJpGk4jHEti9nIN4HVxKdd1DBzaDAgPufi0ma954PjFp8jQZf2MLH/vu8OfcODKSMEJ+znU
+        Qzt9Cjwvc3R5bGU+DQogIDxwYXRoIGQ9Ik0xNiwxNkg2di0yaDEwVjE2eiBNMTYsMThINnYyaDEwVjE4
-        9W8p8n346J9Add0Tfttx9hUSEvaccWNCBOeeDmFf/SYsop8b/9rE18qArur0fd+R2sc4XPsI7qH3PNDw
+        eiIgY2xhc3M9IlJlZCIgLz4NCiAgPHBhdGggZD0iTTI2LDI2djNjMCwwLjYtMC40LDEtMSwxSDFjLTAu
-        aoGr7p7gA86PO7lLD7byddfejbDuXm9jgdVETyrIGrLhfwK0by3R8G+pRI9uW5UDSruOrSuy/WBlGx9m
+        NiwwLTEtMC40LTEtMVYxYzAtMC42LDAuNC0xLDEtMWgyNGMwLjYsMCwxLDAuNCwxLDF2N2gtMlYySDJ2
-        zz8CKycyKpQrsLWW0D6V6jdzUIrq8TztCAAAAABJRU5ErkJggg==
+        MjZoMjJ2LTJIMjZ6ICAgTTIwLDZINnYyaDE0VjZ6IE0xNiwxMEg2djJoMTBWMTB6IE0xNiwyMkg2djJo
-</value>
+        MTBWMjJ6IiBjbGFzcz0iQmxhY2siIC8+DQogIDxwYXRoIGQ9Ik0zMSwxMEgxOWMtMC42LDAtMSwwLjQt
-  </data>
+        MSwxdjEyYzAsMC42LDAuNCwxLDEsMWgxMmMwLjYsMCwxLTAuNCwxLTFWMTFDMzIsMTAuNCwzMS42LDEw
-  <data name="bbtniNewVariant2.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        LDMxLDEweiBNMzAsMThoLTR2NGgtMiAgdi00aC00di0yaDR2LTRoMnY0aDRWMTh6IiBjbGFzcz0iR3Jl
-    <value>
+        ZW4iIC8+DQo8L3N2Zz4L
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAbdEVYdFRpdGxlAE1vZGVsO0NvcHk7Q29weU1vZGVs
-        O4ktWcsAAAhaSURBVFhHjZZ7UFXXFcYRFBB8v5LaiZM4k0wmbf/pdDqNiY1p0sRJ7WOSMa+mnbSxTmKT
-        ZqiCDqOgXtAQjALG2GhVCIhvMIhIEJAi4jM+iQooCvK478t987jw9Vv7nnMDgkz2zI99L/ec831r7bXX
-        PmEAhjBu3Dh9Ds87fKky7+vL4EwuI1fNlzhfRG7hRXxVcBE5nHMKvlVkZVev5X2j5V4yakvembAtubVh
-        nxN5ro6uFfowELlRmyNEfLjR3d0Lr68bTpcPZpsbza0OXKprw+mLzfhs23ED7x1DlIm6+vawjJ3VDzYw
-        cMh3uUljtEQsI9DXh95AP3oCfQp/V9BAp9sPk82DO/fs+E/+WfT3AxW1t5GaVZrC+yOJMvHp1sofbiAy
-        MjJciImJiZS09vOp3b2BID0BdGn4/N3weLthc3hpwIbMnBplwOPrRVlNI5I2FKVSLIpEEAloRAOjNMIj
-        IiJGC1FRUdEVtQ0IBALwd/coQUEi9/i6ggb42c5laGIG0r88oQz4uvuUidITN7Ei9eA6CkaTQSaGMxCe
-        mX2qMjOnFlm7apG56xQySHCuQcbOGmzaUYONnDfuOKkoO3kTbm8XbE4vbt21wpD1jTLQ09tPw2IigOKK
-        64hLyh9i4n4DEnmEiA83pOAk0k6nDyarC3cZ7fmr91BxqhFHT9TB6nDj1h0rVqYXq+vFBMuEtSJGAigq
-        u4Z/Jn4lJvSaGNbAaIlYhkQgdPf2KXz+XkbKVDv96LBQrNmG9O3/U0JF5ddxuPQKbt+zIO2LMiSkFGKZ
-        YCjE0rVCAQr5eyazSOEYIlkY1sCYTUyvDCXcQwM9fSy2ILLeLk83LDYvbjdbkLKlXBlwc60Ly+qwp+g8
-        GppMuHqzDRfqWnD+SovaktXnm3DqQpNuYPyIBmRdZejCauZa+rkEXdoyWDt9aGy2YtWGklDBiYmDR69g
-        d+EZtBntaDW7cK/Diea2Tpq14U6LDRk7qsXABCJNalgDkRu2Bw2IuBSRLi74BO59G+ug8Y4Fy1IPDyo4
-        NwtubxG748FT7AtOWDo9MDs8XDIPLHYPi7ZKDEx8kIFwEpW+jevKf/h7gqJKmKI6nq4eOFx+NLDgPko6
-        wCuHFlx+4Tlk76tWhWnl7rAwY9KsNnypDEwayUB0Gi/S0xoU5d5XwsTfQ3ppoAt32h2s+CNYvHw3FsXn
-        YdGyPLy3VMjF/iMXkbSpFB1mh8qWjYalWbETioHJIxpYv1VrJFq0IqgLy+zig5zEZOe+b7Hj8s12nLva
-        zGK7i+pzTag83YjqM7dYH8fQarSwXrxwuLvg5b1pW8vFwJSRDIxd90WlMiBi7oH4KE7cLEKZJQsWB3sC
-        d0S72Y0WKTYaqm+ysOisSEw7ipZ2M6/xsEt2qaVZ//lxMTCVyCE1rIGYlM0VNNB/n3BQVHAK3IqdjEpm
-        iU4EZJ2NPJDaTC42KjdWpB3B3VYTzCw+mzLQi9TNZWJgmmZAnbYDDUSQWENWOfpowEXxkKhHEyVOd3Du
-        lJk4dChipokOZsTOdU9IPcKzwcgMSSHyzOCSGjJLxcD0kQyMX83i6evrV4JKbKCIJuRwBWeJTB4exM8s
-        BJGsLTUUoOFuOw25YOFvXtZQMp9N4RlE2vGwBiYkfVbCLdWvCYuYJqh9toUEg1h0NHGzw89oA4hbfYj1
-        0Io2NiQTa8VDU9K4KPzQEAPaGE0mSvGIAT1CHRELivuDwiI2QNRkZ0ESWQIp1H+xR1xvaEaL0YF21oSL
-        ASR+WozY2NiZY8eOjZZ3jaDs90MMTFq+7mv1tvN9lJoIP5s7BYrpMDKj1cuG46dh7ndWvIUpd7o8KCz5
-        ljuDNWDt5OuaE45OF4rLLyM6Ono2xSeGh4ePoZ5039AQA5PjDYeVAVk3hYhrwhKpitbmh5HiHewFFmK1
-        833w6CHcSl6ChiSyagnqVy7BzZXv43pZFs5lzMXZjc/idPozqP1kDmrWPY1Ro0bFUG9QFsTRFDk+e3gS
-        6ikORSzCErGI2yjOyEXczIi/y9mOlvQE4EReiKasJFQteQb3yuMAx94Q7aXvoiTup2JgAvWk7kJDDEyV
-        4pGjWMRE1KiEg6Ii3k7aKC6d0ETxnTwB3zKU4c01pXh9dSkWJh/Da0kl2BQ/F39dNxt/SZmNdwTDY3h7
-        7aO4kDwDBYufkMqbRCTroSEGpn2cfECdhLp4UNhHYQ2rh0ct15oHzX+LLmNjaQPOehAi83gj/piwCLlV
-        78KK7BA7Kl7H7+JmKgN73nlMDEwmIQPqXYBM+2gVDbBtDhb1MeograTZ6ESHyY4/JRYj46wDm07bsbGW
-        L6Q1Nryx5hjeTH4UB+rnY3/Dy9hf/xL21f8WCxJj8eIHM5SB7FcfGZIB3cDUDxP3q74tncsrqEOIr2Na
-        WxbkDdhktuGV+AJ8Um3F+pNWpFZZYKiyKgMLV87C3hsvYs+NF5B/4zfYff15ZeC5v09D8eKHkf7CjAxq
-        jSNSA2onyB/ViN77966q91fsweIEsjwf/4jP52eZeezyyBX+FpeD3YdO4qWP92FNpRmrK8xIKjdh5XGz
-        MvDqikeQ99088hxy6+Yih4iBX/15MlJ/PT2LOlNIJBm0C+RLFJHqnE5+dB8zBzCL/GTekt1I/MaE5ceM
-        SDjWgfgSI+YtzsYf4n+MnGvPIvvaHOy6+rTi+Q/G42cLxm/mfdNINBG9QX1Avsg/ZV3EnY6Yup9YMv2p
-        36fjyQVpePKV9Xhifgoef9mAWXM+3PbLtybjF2+QhZPw89cmKp6aP04i18VDqVdD78k/BA7dqBiRQpJs
-        PaQxQ/su88NEMiezfJ9I5J7B4jKGE3oQ2hiYLSnegRkbLnNyjVw7JO1hYWFh/wecxwMOH7dYDAAAAABJ
-        RU5ErkJggg==
 </value>
   </data>
   <data name="bStaticItem1.ItemAppearance.Normal.Font" type="System.Drawing.Font, System.Drawing">
@@ -2812,7 +2649,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;RibbonStatusBar1.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>9</value>
   </data>
   <data name="&gt;&gt;RibbonControl1.Name" xml:space="preserve">
     <value>RibbonControl1</value>
@@ -2824,11 +2661,23 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;RibbonControl1.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>10</value>
   </data>
   <data name="RibbonPage2.Text" xml:space="preserve">
     <value>RibbonPage2</value>
   </data>
+  <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>361, 134</value>
+  </metadata>
+  <data name="ContextMenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>61, 4</value>
+  </data>
+  <data name="&gt;&gt;ContextMenuStrip1.Name" xml:space="preserve">
+    <value>ContextMenuStrip1</value>
+  </data>
+  <data name="&gt;&gt;ContextMenuStrip1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -3338,6 +3187,12 @@
   <data name="&gt;&gt;tsmiNodedownSearch.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;EntitätsweiteSucheToolStripMenuItem.Name" xml:space="preserve">
+    <value>EntitätsweiteSucheToolStripMenuItem</value>
+  </data>
+  <data name="&gt;&gt;EntitätsweiteSucheToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;ToolStripSeparator12.Name" xml:space="preserve">
     <value>ToolStripSeparator12</value>
   </data>
@@ -3872,6 +3727,12 @@
   <data name="&gt;&gt;docCM_Copy.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;ExportNachExcelToolStripMenuItem.Name" xml:space="preserve">
+    <value>ExportNachExcelToolStripMenuItem</value>
+  </data>
+  <data name="&gt;&gt;ExportNachExcelToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;ToolStripSeparator10.Name" xml:space="preserve">
     <value>ToolStripSeparator10</value>
   </data>

app/DD-Record-Organizer/frmConstructor_Main.vb

@@ -297,7 +297,7 @@ Public Class frmConstructor_Main
             'End Try
 
             ' Hintergrund Bild initialisieren
-            BACKGROUND_HELPER = New ClassBackgroundHelper(GridViewDoc_Search, My.Resources.windream_Logo_transparent_klein)
+            BACKGROUND_HELPER = New ClassBackgroundHelper(GridViewDoc_Search, My.Resources.windream_Logo_transparent_klein) '
 
 
             ' Bestimme Dinge ausblenden wenn kein admin
@@ -353,7 +353,7 @@ Public Class frmConstructor_Main
                 End If
             End If
 
-            CURRENT_DT_TBPMO_ENTITY_RIGHT_CONTROLS = ClassDatabase.Return_Datatable(String.Format("SELECT * FROM TBPMO_ENTITY_RIGHT_CONTROLS where ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", CONSTRUCTORID), False)
+            CURRENT_DT_TBPMO_ENTITY_RIGHT_CONTROLS = ClassDatabase.Return_Datatable(String.Format("SELECT T.* FROM TBPMO_ENTITY_RIGHT_CONTROLS T INNER JOIN VWPMO_CONSTRUCTOR_FORMS T1 ON T.ENTITY_ID = T1.FORM_ID where T1.CONSTRUCT_ID = {0}", CONSTRUCTORID), False)
 
             Load_Adding_users()
             Load_Configurable_Nodes()
@@ -362,7 +362,7 @@ Public Class frmConstructor_Main
             ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, "Error in Loading Form part 2")
         End Try
         Try
-            SQL = String.Format("select * from VWPMO_STRUCTURE_NODES where ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", CONSTRUCTORID)
+            SQL = String.Format("select T.* from VWPMO_STRUCTURE_NODES T INNER JOIN VWPMO_CONSTRUCTOR_FORMS T1 ON T.ENTITY_ID = T1.FORM_ID WHERE T1.CONSTRUCT_ID = {0}", CONSTRUCTORID)
             Dim DT As DataTable = ClassDatabase.Return_Datatable(SQL, True)
             If DT.Rows.Count > 1 Then
                 TreeView_perControl = True
@@ -397,7 +397,7 @@ Public Class frmConstructor_Main
 
 
                 DT_TREEVIEW_NODES_FIRST = ClassHelper.FILTER_DATATABLE(DT, "EXPAND_NODE = 1", "")
-                SQL = String.Format("select * from TBPMO_STRUCTURE_NODES_CONFIGURATION where ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", CONSTRUCTORID)
+                SQL = String.Format("select T.* from TBPMO_STRUCTURE_NODES_CONFIGURATION T INNER JOIN VWPMO_CONSTRUCTOR_FORMS T1 ON T.ENTITY_ID = T1.FORM_ID WHERE T1.CONSTRUCT_ID = {0}", CONSTRUCTORID)
                 DT_TREEVIEW_CONFIGURATION = ClassDatabase.Return_Datatable(SQL)
 
                 Try
@@ -477,7 +477,6 @@ Public Class frmConstructor_Main
 
             FORM_LOADED = True
             sw.Done()
-            If LogErrorsOnly = False Then ClassLogger.Add("", False)
         Catch ex As System.Exception
             ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, "Error in Loading Form part 4")
         End Try
@@ -574,9 +573,11 @@ Public Class frmConstructor_Main
             If ACT_EBENE_STRING Is Nothing Then
                 Exit Sub
             End If
+            If My.Settings.SaveDocGridlayout Then
+                Dim XMLPath = Get_DocGrid_Layout_Filename()
+                GridViewDoc_Search.SaveLayoutToXml(XMLPath)
+            End If
 
-            Dim XMLPath = Get_DocGrid_Layout_Filename()
-            GridViewDoc_Search.SaveLayoutToXml(XMLPath)
             ' Update_Status_Label(True, "Grid Layout Loaded")
         Catch ex As Exception
             ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace)
@@ -587,12 +588,15 @@ Public Class frmConstructor_Main
             If ACT_EBENE_STRING Is Nothing Then
                 Exit Sub
             End If
-            Dim XMLPath = Get_DocGrid_Layout_Filename()
+            If My.Settings.SaveDocGridlayout Then
-            If File.Exists(XMLPath) Then
+                Dim XMLPath = Get_DocGrid_Layout_Filename()
-                GridViewDoc_Search.RestoreLayoutFromXml(XMLPath)
+                If File.Exists(XMLPath) Then
-                GridViewDoc_Search.GuessAutoFilterRowValuesFromFilter()
+                    GridViewDoc_Search.RestoreLayoutFromXml(XMLPath)
+                    GridViewDoc_Search.GuessAutoFilterRowValuesFromFilter()
+                End If
             End If
 
+
         Catch ex As Exception
             ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace)
         End Try
@@ -949,7 +953,7 @@ Public Class frmConstructor_Main
     '            End If
     '        End If
     '    Catch ex As Exception
-    '        ClassLogger.Add("Error In Search_RowHandle: " & ex.Message, False)
+    '        LOGGER.Warn("Error In Search_RowHandle: " & ex.Message)
     '    End Try
     'End Function
     Public Function Get_Grid_Column_Count() As Integer
@@ -1051,7 +1055,7 @@ Public Class frmConstructor_Main
             If RECID = RECORD_ID And ENTITY_RECORD_COUNT > 1 And _refresh = False And ERROR_WHILE_SAVING = False Then
                 Exit Sub
             End If
-            If LogErrorsOnly = False Then ClassLogger.Add(" >> RowHandler: RID: " & RECID.ToString & " - " & Now, False)
+            LOGGER.Debug("RowHandler: RID: " & RECID.ToString & " - " & Now)
             'Hier jetzt erst das Anzeigen für einen selektierten Datensatz
             If GRID_TYPE = GridType.Grid Then
                 If IsTopFirstRow Then
@@ -1266,7 +1270,7 @@ Public Class frmConstructor_Main
             Next
             sw.Done()
         Catch ex As Exception
-            ClassLogger.Add("Error in SearchNodeForRecord: " & ex.Message, True)
+            LOGGER.Warn("Error in SearchNodeForRecord: " & ex.Message)
         End Try
     End Sub
     Private Sub TreeViewMain_BeforeSelect(sender As Object, e As TreeViewCancelEventArgs) Handles TreeViewMain.BeforeSelect
@@ -1576,7 +1580,7 @@ Public Class frmConstructor_Main
             If SelectedNode IsNot Nothing Then
                 Dim _TagENT_ID = ClassNodeNavigation.Return_ENTITY_FOR_TAG(SelectedNode.Tag)
                 If (_TagENT_ID <> 0 And _TagENT_ID <> ENTITY_ID) Or _TagENT_ID <> CURRENT_ENTITY_ID Then
-                    ClassLogger.Add("Entity-Data needs to be reloaded...", False)
+                    LOGGER.Info("Entity-Data needs to be reloaded...")
 
                     ENTITY_ID = _TagENT_ID
                     CURRENT_ENTITY_ID = ENTITY_ID
@@ -1672,7 +1676,7 @@ Public Class frmConstructor_Main
                         Try
                             PWplainText = wrapper.DecryptData(_row.Item("AD_USER_PW").ToString())
                         Catch ex As Exception
-                            ClassLogger.Add("- the Password for FileAddingUser '" & FAU_AD_USER & "' could not be decrypted", False)
+                            LOGGER.Warn("- the Password for FileAddingUser '" & FAU_AD_USER & "' could not be decrypted")
                             PWplainText = ""
                         End Try
                         FAU_AD_USER_PW = PWplainText
@@ -2223,12 +2227,12 @@ Public Class frmConstructor_Main
                 RECORD_ID = SELECTED_RECORD_ID
                 ClassRightManagement.Check_Set_Rights(RECORD_ID, ENTITY_ID)
                 CONTROL_HANDLING()
-                Dim sql = String.Format("select TRL.DOC_ID, TDRL.FULL_FILENAME FROM TBPMO_DOC_RECORD_LINK TRL, TBPMO_DOCRESULT_LIST TDRL WHERE TRL.DOC_ID = TDRL.DocID AND TRL.RECORD_ID = {0}", RECORD_ID)
+                Dim sql = String.Format("select TRL.DOC_ID, TDRL.FULL_FILENAME FROM TBPMO_DOC_RECORD_LINK TRL INNER JOIN TBPMO_DOCRESULT_LIST TDRL ON TRL.DOC_ID = TDRL.DocID WHERE TRL.RECORD_ID =  {0}", RECORD_ID)
 
                 Dim DT_DOC_RESULT As DataTable = DD_LIB_Standards.clsDatabase.Return_Datatable(sql, False)
 
                 If IsNothing(DT_DOC_RESULT) Then
-                    ClassLogger.Add(">> DT_DOC_RESULT is nothing!", True)
+                    LOGGER.Warn("DT_DOC_RESULT is nothing!")
                 End If
                 If ClassHelper.DeleteRecord(SELECTED_RECORD_ID, "DELETE_RECORD - UserDecidedYes") = True Then
                     RECORD_CHANGED = False
@@ -2454,7 +2458,7 @@ Public Class frmConstructor_Main
 
     Sub Load_Entity_Data_CONTROLS_RECORDS()
         Try
-            If LogErrorsOnly = False Then ClassLogger.Add("START Load_Entity_Data", False)
+            LOGGER.Debug("START Load_Entity_Data")
             Dim sw As New SW("Load_Entity_Data")
             PARENT_SKIPPED = False
             ' Me.Cursor = Cursors.WaitCursor
@@ -2521,21 +2525,21 @@ Public Class frmConstructor_Main
             Try
                 ADD_RECORDS_CONSTR = resultDT_VWPMO_CONSTRUCTOR_FORMS.Item("ADD_RECORDS")
             Catch ex As Exception
-                ClassLogger.Add(ex.Message, True)
+                LOGGER.Warn(ex.Message)
                 ADD_RECORDS_CONSTR = True
             End Try
             If ADD_RECORDS_CONSTR = False Then
-                ClassLogger.Add("ADDING RECORDS IS PROHIBITED FOR ENTITY: " & ENTITY_ID, False)
+                LOGGER.Warn("ADDING RECORDS IS PROHIBITED FOR ENTITY: " & ENTITY_ID)
             End If
 
             expression = String.Format("ENTITY_ID = {0} AND LANGUAGE = '{1}'", ENTITY_ID, USER_LANGUAGE)
-            DT_WINDREAM_COLUMNS_GRID = ClassHelper.FILTER_DATATABLE(CURRENT_RESULTLIST_CONFIG, expression, "SEQUENCE")  'ClassDatabase.Return_Datatable(sql, True)
+            DT_WINDREAM_COLUMNS_GRID = ClassHelper.FILTER_DATATABLE(CURRENT_RESULTLIST_CONFIG, expression, "SEQUENCE")
             expression = String.Format("ENTITY_ID = {0} AND TYPE_ID = 3 AND LANGUAGE = '{1}'", ENTITY_ID, USER_LANGUAGE)
-            DT_DOCRESULT_DROPDOWN_ITEMS = ClassHelper.FILTER_DATATABLE(CURRENT_TBPMO_DOCRESULT_DROPDOWN_ITEMS, expression, "SEQUENCE") 'ClassDatabase.Return_Datatable(sql, True)
+            DT_DOCRESULT_DROPDOWN_ITEMS = ClassHelper.FILTER_DATATABLE(CURRENT_TBPMO_DOCRESULT_DROPDOWN_ITEMS, expression, "SEQUENCE")
 
-            DT_RESULTLIST_OPTIONS = ClassHelper.FILTER_DATATABLE(CURRENT_VARIABLE_CONTROLS, "ENTITY_ID = " & ENTITY_ID, "") ' ClassDatabase.Return_Datatable(sql, True)
+            DT_RESULTLIST_OPTIONS = ClassHelper.FILTER_DATATABLE(CURRENT_VARIABLE_CONTROLS, "ENTITY_ID = " & ENTITY_ID, "")
             expression = String.Format("ENTITY_ID = {0} AND LANGUAGE = '{1}' AND COLUMN_VIEW LIKE 'VALUE%'", ENTITY_ID, USER_LANGUAGE)
-            DT_RESULTLIST_VARIABLE_VALUE = ClassHelper.FILTER_DATATABLE(CURRENT_RESULTLIST_CONFIG, expression, "SEQUENCE")  'ClassDatabase.Return_Datatable(sql, True)
+            DT_RESULTLIST_VARIABLE_VALUE = ClassHelper.FILTER_DATATABLE(CURRENT_RESULTLIST_CONFIG, expression, "SEQUENCE")
             Dim ENTITY_ROW = (From form In DT_ENTITY_DATA.AsEnumerable()
                               Select form
                               Where form.Item("GUID") = ENTITY_ID).Single()
@@ -2551,7 +2555,7 @@ Public Class frmConstructor_Main
                 CURRENT_ENTITY_REDUNDANT_ID = 0
             End If
             'sql = String.Format("select * from TBPMO_RIGHT_USER WHERE USER_ID = {0} AND ENTITY_ID = {1}", USER_GUID, ENTITY_ID)
-            DT_RIGHTS_USER = ClassHelper.FILTER_DATATABLE(CURRENT_TBPMO_RIGHT_USER, "ENTITY_ID = " & ENTITY_ID, "") ' ClassDatabase.Return_Datatable(sql, True)
+            DT_RIGHTS_USER = ClassHelper.FILTER_DATATABLE(CURRENT_TBPMO_RIGHT_USER, "ENTITY_ID = " & ENTITY_ID, "")
             expression = String.Format("")
             sql = String.Format("SELECT DISTINCT EDIT_REC,ADD_REC,DELETE_REC,ADD_DOC,VIEW_DOC,DELETE_DOC FROM TBPMO_RIGHT_GROUP WHERE ENTITY_ID = {0} AND GROUP_ID IN (SELECT GROUP_ID FROM TBDD_GROUPS_USER WHERE USER_ID = {1})", ENTITY_ID, USER_GUID)
             DT_RIGHTS_GROUP = ClassDatabase.Return_Datatable(sql, True)
@@ -2617,7 +2621,7 @@ Public Class frmConstructor_Main
                     PARENT_RECORDID = 0
                     EBENE1_ENTITY = TreeViewMain.SelectedNode.Text
                     ACT_EBENE_STRING = EBENE1_ENTITY
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Level 1 selected in TreeView", False)
+                    LOGGER.Debug("Level 1 selected in TreeView")
 
 
                     'tslblEntity2.Visible = False
@@ -2636,7 +2640,7 @@ Public Class frmConstructor_Main
                 Case 2
                     EBENE2_ENTITY = TreeViewMain.SelectedNode.Text
                     ACT_EBENE_STRING = EBENE2_ENTITY
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Level 2 selected in TreeView", False)
+                    LOGGER.Debug("Level 2 selected in TreeView")
                     EBENE3_ENTITY = ""
                     'Wenn bereits ein Record für Ebene 1 gewählt wurde dann einschränken
                     If EBENE1_RECID > 0 Then
@@ -2670,7 +2674,7 @@ Public Class frmConstructor_Main
                 Case 3
                     EBENE3_ENTITY = TreeViewMain.SelectedNode.Text
                     ACT_EBENE_STRING = EBENE3_ENTITY
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Level 3 selected in TreeView", False)
+                    LOGGER.Debug("Level 3 selected in TreeView")
 
                     Dim result4 = (From form In DT_VWPMO_CONSTRUCTOR_FORMS.AsEnumerable()
                                    Select form
@@ -2691,7 +2695,7 @@ Public Class frmConstructor_Main
                                 CURRENT_ENTITYSQL = CURRENT_ENTITYSQL.ToString.Replace("@T2.RECORD1_ID", PARENT_RECORDID)
                             End If
                         Catch ex As Exception
-                            ClassLogger.Add("Error in Replacing patterns in entity_sql: " & ex.Message)
+                            LOGGER.Warn("Error in Replacing patterns in entity_sql: " & ex.Message)
                         End Try
                     Else
 
@@ -2809,7 +2813,7 @@ Public Class frmConstructor_Main
                         primaryKey(0) = CURRENT_DT_ENTITY_RECORDS.Columns("Record-ID")
                         CURRENT_DT_ENTITY_RECORDS.PrimaryKey = primaryKey
                     Catch ex As Exception
-                        ClassLogger.Add("Could not set the primary Key(Record-ID): " & ex.Message, True)
+                        LOGGER.Warn("Could not set the primary Key(Record-ID): " & ex.Message)
                     End Try
 
 
@@ -2979,7 +2983,6 @@ Public Class frmConstructor_Main
 
             For Each Column As DataColumn In DT.Columns
                 Dim index As Integer = DT.Columns.IndexOf(Column)
-                Dim RECORDID_Column As TileViewItemElement
                 Dim ImageColumn As TileViewItemElement
                 Dim HeadlineColumn As TileViewItemElement
                 Dim TextColumn As TileViewItemElement
@@ -3195,7 +3198,7 @@ Public Class frmConstructor_Main
                     If IsNothing(PARENT_RECORD1) Then
                         Dim New_Record = ClassRecordCommands.GetLastRecord
                         If Not IsNothing(New_Record) Then
-                            If LogErrorsOnly = False Then ClassLogger.Add(" >> Parent-Record Ebene 1 wird neu angelegt...", False)
+                            LOGGER.Debug("Parent-Record Ebene 1 wird neu angelegt...")
                             'Die neue Record-ID setzen
                             ClassRecordCommands.ConnectRecord(New_Record, RECORDID, "PARENT-LINK FOR ENTITY " & ENTITY_ID & "")
                             Return New_Record
@@ -3213,7 +3216,7 @@ Public Class frmConstructor_Main
                     If IsNothing(PARENT_RECORD2) Then
                         Dim New_Record = ClassRecordCommands.GetLastRecord
                         If Not IsNothing(New_Record) Then
-                            If LogErrorsOnly = False Then ClassLogger.Add(" >> Parent-Record Ebene 1 wird neu angelegt...", False)
+                            LOGGER.Debug("Parent-Record Ebene 1 wird neu angelegt...")
                             'Die neue Record-ID setzen
                             ClassRecordCommands.ConnectRecord(New_Record, RECORDID, "PARENT-LINK FOR ENTITY " & ENTITY_ID & "")
                             Return New_Record
@@ -3255,7 +3258,7 @@ Public Class frmConstructor_Main
                 '    grvwGrid.GridControl.RepositoryItems.Add(chkRep)
                 '    grvwGrid.Columns("files?").ColumnEdit = chkRep
                 'Catch ex As Exception
-                '    ClassLogger.Add(">> Attention: Column files? not existing in GridView?", False)
+                '    LOGGER.Warn("Attention: Column files? not existing in GridView?")
                 'End Try
                 'grvwGrid.Columns("Record-ID").OptionsColumn.AllowShowHide = False
             End If
@@ -3368,7 +3371,7 @@ Public Class frmConstructor_Main
                               Where form.Item("GUID") = ENTITY_ID).Single()
 
             Update_Status_Label(False, "")
-            If LogErrorsOnly = False Then ClassLogger.Add(" >> GRID_RECORD ID: " & Rec_ID.ToString, False)
+            LOGGER.Debug("GRID_RECORD ID: " & Rec_ID.ToString)
             'Me.pnlDetails.Visible = True
             If FORM_TYPE = 5 And EntityLoad = False Or IS_SINGLE_RECORD = True And EntityLoad = False Then '#### Es sind untergeordnete Entitäten geöffnet####
                 Dim linkedRecord
@@ -3583,7 +3586,7 @@ Public Class frmConstructor_Main
                     Return Grid_RecordID
                 Else
                     'tsstatus_Detail_show(True, "Grid_RecordID konnte nicht gewählt werden!")
-                    'ClassLogger.Add(">> Grid_RecordID konnte nicht gewählt werden - SelectedRecord_ShowData", True)
+                    'LOGGER.Info("Grid_RecordID konnte nicht gewählt werden - SelectedRecord_ShowData", True)
                     Return Nothing
                 End If
             Else
@@ -3761,7 +3764,7 @@ Public Class frmConstructor_Main
                     End If
                 End If
             Else
-                ClassLogger.Add(">> No files 2 delete - after deleting record!", False)
+                LOGGER.Info("No files 2 delete - after deleting record!")
             End If
             Cursor = Cursors.Default
         Catch ex As Exception
@@ -3783,11 +3786,11 @@ Public Class frmConstructor_Main
 
 
             If CURRENT_DOCSEARCH_SQL = "" Then
-                CURRENT_DOCSEARCH_SQL = String.Format("SELECT DISTINCT T.* " & vbNewLine &
+                CURRENT_DOCSEARCH_SQL = $"SELECT DISTINCT T.* 
-                   "FROM " & vbNewLine &
+                                FROM 
-                   "VWPMO_DOC_SEARCH T" & vbNewLine &
+                                TBPMO_DOCRESULT_LIST T INNER JOIN TBPMO_DOC_RECORD_LINK T1 ON T.DocID = T1.DOC_ID
-                   "WHERE T.DocID IN (select DISTINCT T.DOC_ID from TBPMO_DOC_RECORD_LINK T, TBPMO_RECORD T1 WHERE T.RECORD_ID = T1.GUID AND T1.FORM_ID = {0}) " & vbNewLine &
+                                INNER JOIN TBPMO_RECORD T2 ON T1.RECORD_ID = T2.GUID
-                   "AND T.DocID IN (SELECT dwObjectID FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwUserOrGroupID = {2} AND dwObjectID = T.DocID)", ENTITY_ID, USER_LANGUAGE, USERID_FK_INT_ECM)
+                                WHERE T2.FORM_ID = {ENTITY_ID} AND T2.DELETED = 0)"
             Else
                 CURRENT_DOCSEARCH_SQL = CURRENT_DOCSEARCH_SQL.Replace("@ENTITY_ID", ENTITY_ID)
                 CURRENT_DOCSEARCH_SQL = CURRENT_DOCSEARCH_SQL.Replace("@USER_LANGUAGE", USER_LANGUAGE)
@@ -3917,6 +3920,10 @@ Public Class frmConstructor_Main
                         grvwGrid.FindFilterText = CURRENT_FULLTEXT_PATTERN
                     End If
 
+                    If DT_DOCRESULT_DROPDOWN_ITEMS.Rows.Count > 0 Then
+                        LOGGER.Info($"RUN_WDSEARCH_GRID - DT_DOCRESULT_DROPDOWN_ITEMS [{DT_DOCRESULT_DROPDOWN_ITEMS.Rows.Count}]!")
+                    End If
+
                     ClassWindreamDocGrid.FillColumns(
                        GridViewDoc_Search,
                        DT_RESULT,
@@ -3928,10 +3935,6 @@ Public Class frmConstructor_Main
                        AddressOf OnCheckboxValueChanged,
                        CURRENT_SEARCH_TYPE, RECORD_ID)
 
-                    If DT_DOCRESULT_DROPDOWN_ITEMS.Rows.Count > 0 Then
-                        Dim DT_VALUES_FOR_DOC
-
-                    End If
                 End If
             Else
                 Dim selnode As TreeNode = TreeViewMain.SelectedNode
@@ -4225,7 +4228,7 @@ Public Class frmConstructor_Main
                 Return PARENT_RECORDID
             Case Else
                 MsgBox("Undefined pattern '" & content & "' in windream-Search Config. Please inform Your system-administrator.", MsgBoxStyle.Exclamation)
-                ClassLogger.Add(" >> Undefined Search-pattern in windream-search config: " & content, True)
+                LOGGER.Warn("Undefined Search-pattern in windream-search config: " & content)
         End Select
     End Function
     'Private Sub AxObjectListControl_ItemClicked(sender As Object, e As EventArgs) Handles AxObjectListControl.ItemClicked
@@ -4280,8 +4283,8 @@ Public Class frmConstructor_Main
             End If
 
         Catch ex As Exception
-            ClassLogger.Add(" ### Error in CloseDocView")
+            LOGGER.Warn(" ### Error in CloseDocView")
-            ClassLogger.Add("### " & ex.Message & " ###")
+            LOGGER.Warn("### " & ex.Message & " ###")
         End Try
 
     End Sub
@@ -4336,7 +4339,7 @@ Public Class frmConstructor_Main
         End If
     End Sub
     Private Sub ButtonResetView_Click(sender As Object, e As EventArgs) Handles ButtonResetView.Click
-        Reset_View_layout
+        Reset_View_layout()
     End Sub
     Sub Reset_View_layout()
         Try
@@ -4545,22 +4548,22 @@ Public Class frmConstructor_Main
                     RUN_WDSEARCH_GRID()
                     TimerClearResultfiles.Start()
                 Else
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> No new files were added or windream tab is not focused!", False)
+                    LOGGER.Debug("No new files were added or windream tab is not focused!")
                 End If
                 Me.Cursor = Cursors.Default
             Else
                 'If RIGHT_RECORD_AND_FILE_READ_ONLY = True Then
-                '    ClassLogger.Add(">> RIGHT_RECORD_AND_FILE_READ_ONLY is set! No DragDrop allowed", False)
+                '    LOGGER.Warn("RIGHT_RECORD_AND_FILE_READ_ONLY is set! No DragDrop allowed")
                 'End If
                 If RIGHT_READ_ONLY_DOC = True Then
-                    ClassLogger.Add(">> RIGHT_WD_FORBIDDEN is set! No DragDrop allowed", False)
+                    LOGGER.Warn("RIGHT_WD_FORBIDDEN is set! No DragDrop allowed")
                 Else
-                    ClassLogger.Add(">> No DragDrop allowed - ELSE", False)
+                    LOGGER.Warn("No DragDrop allowed - ELSE")
                 End If
 
             End If
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in Drag_Drop: " & ex.Message)
+            LOGGER.Warn("Unexpected Error in Drag_Drop: " & ex.Message)
             MsgBox("Unexpected Error in DragDrop - Please check the log for further information!", MsgBoxStyle.Exclamation)
         Finally
 
@@ -4584,7 +4587,7 @@ Public Class frmConstructor_Main
                     If Not IsNothing(Str) Then
                         Dim DropType = Str.Substring(0, Str.LastIndexOf("@") + 1)
                         If DropType.ToString.Contains("SCAN") = False Then
-                            ClassLogger.Add(">> Check_Dropped_Files:" & Str.ToString, False)
+                            LOGGER.Info("Check_Dropped_Files:" & Str.ToString)
                             Dim CURRENT_WORKFILE = Str.Substring(Str.LastIndexOf("@") + 1)
                             If CURRENT_WORKFILE.ToString.Contains("@") Then
                                 MsgBox("File contains invalid operator @!" & vbNewLine & "Please rename file and try again!", MsgBoxStyle.Exclamation)
@@ -4950,8 +4953,6 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
             Load_Level1()
         End If
         sw.Done()
-        If LogErrorsOnly = False Then ClassLogger.Add("", False)
-
         FORM_SHOWN = True
     End Sub
     Sub Jump_Record()
@@ -5210,9 +5211,9 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
                         Dim ColorRow As Color
                         Try
                             ColorRow = Color.FromName(rowCellValue)
-                            If LogErrorsOnly = False Then ClassLogger.Add(">> RowBackColor '" & rowCellValue & "' will be used for record: " & Get_Focused_Row_Cell_Value("Record-ID"), False)
+                            LOGGER.Debug("RowBackColor '" & rowCellValue & "' will be used for record: " & Get_Focused_Row_Cell_Value("Record-ID"))
                         Catch ex As Exception
-                            ClassLogger.Add(">> RowBackColor '" & rowCellValue & "'could not be converted from name!", False)
+                            LOGGER.Info("RowBackColor '" & rowCellValue & "'could not be converted from name!")
                             Exit Sub
                         End Try
                         'Dim c As Color = DirectCast(rowCellValue, Color)
@@ -5220,7 +5221,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
                         e.HighPriority = True
                     End If
                 Catch ex As Exception
-                    ClassLogger.Add(">> Unexpected Error in RowStyle: " & ex.Message, False)
+                    LOGGER.Warn("Unexpected Error in RowStyle: " & ex.Message)
                 End Try
             End If
         End If
@@ -5240,7 +5241,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
             End If
 
         Catch ex As Exception
-            ClassLogger.Add(">> Unexpected Error in grvwGrid_MouseDown: " & ex.Message, False)
+            LOGGER.Warn("Unexpected Error in grvwGrid_MouseDown: " & ex.Message)
         End Try
 
     End Sub
@@ -5785,7 +5786,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
             Try
                 RENAME_DOC_PATH = GridViewDoc_Search.GetFocusedRowCellValue(GridViewDoc_Search.Columns("FULLPATH"))
             Catch ex As Exception
-                ClassLogger.Add(">> Attention: Could not set DocVariable RENAME_DOC_PATH: " & ex.Message, False)
+                LOGGER.Warn("Attention: Could not set DocVariable RENAME_DOC_PATH: " & ex.Message)
                 RENAME_DOC_PATH = Nothing
             End Try
             If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
@@ -5845,7 +5846,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
 
 
             Catch ex As Exception
-                ClassLogger.Add(">> Unexpected Error in Checking Value In Work: " & ex.Message, False)
+                LOGGER.Warn("Unexpected Error in Checking Value In Work: " & ex.Message)
             End Try
 
             Try
@@ -5874,8 +5875,8 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
                                 End If
 
                                 If rowcolorname <> "" Then
-                                        Exit For
+                                    Exit For
-                                    End If
+                                End If
                             Next
                             If rowcolorname <> "" Then
                                 ColorRow = Color.FromName(rowcolorname)
@@ -5892,7 +5893,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
 
                 End If
             Catch ex As Exception
-                ClassLogger.Add(">> Unexpected Error in RowStyle-Color Dropdown: " & ex.Message, False)
+                LOGGER.Warn("Unexpected Error in RowStyle-Color Dropdown: " & ex.Message)
             End Try
 
         End If
@@ -5948,7 +5949,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
                         If USER_IS_ADMIN = False Then
                             ContextMenu_Read()
                         Else
-                            ClassLogger.Add(">> FileRight is R but User is Admin!! - Check the configuration!", False)
+                            LOGGER.Warn("FileRight is R but User is Admin!! - Check the configuration!")
                         End If
 
                         ROW_READ_ONLY = True
@@ -5960,7 +5961,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
                         If USER_IS_ADMIN = False Then
                             ContextMenu_Read()
                         Else
-                            ClassLogger.Add(">> FileRight is '' but User is Admin!! - Check the configuration!", False)
+                            LOGGER.Warn("FileRight is '' but User is Admin!! - Check the configuration!")
                         End If
                         ROW_READ_ONLY = True
                 End Select
@@ -5973,7 +5974,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
                     If USER_IS_ADMIN = False Then
                         ContextMenu_Read()
                     Else
-                        ClassLogger.Add(">> RIGHT_READ_ONLY_DOC = True but User is Admin!! - Check the configuration!", False)
+                        LOGGER.Warn("RIGHT_READ_ONLY_DOC = True but User is Admin!! - Check the configuration!")
                     End If
                 End If
             End If
@@ -5998,6 +5999,8 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
 
     End Sub
     Sub File_in_Work()
+        IW_USER = ""
+        IW_COMMENT = ""
         docCM_InWork.Enabled = True
         Try
             Dim expression As String
@@ -6005,13 +6008,22 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
             Dim foundRowsLevel0() As DataRow
             ' Use the Select method to find all rows matching the filter.
             foundRowsLevel0 = CURRENT_DOC_RESULTS.Select(expression)
+
             Try
-                IW_USER = foundRowsLevel0(0)("IN_WORK_USER")
+                Dim oSQL = "Select IN_WORK,IN_WORK_USER,IN_WORK_COMMENT FROM TBPMO_DOCRESULT_LIST  where DocID = " + ClassWindreamDocGrid.SELECTED_DOC_ID
-                IW_COMMENT = foundRowsLevel0(0)("IN_WORK_COMMENT")
+                Dim oDT As DataTable = ClassDatabase.Return_Datatable(oSQL)
+                If Not IsNothing(oDT) Then
+                    If oDT.Rows.Count = 1 Then
+                        IW_USER = CBool(oDT.Rows(0).Item("IN_WORK_USER"))
+                        IW_COMMENT = CBool(oDT.Rows(0).Item("IN_WORK_COMMENT"))
+                    End If
+                End If
             Catch ex As Exception
                 IW_USER = ""
                 IW_COMMENT = ""
             End Try
+
+
             Dim displ As String
             If CBool(ClassWindreamDocGrid.SELECTED_INWORK) = True Then
                 If IW_USER.ToUpper = USER_USERNAME.ToUpper Or USER_IS_ADMIN Then
@@ -6033,7 +6045,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
             End If
             docCM_InWork.Text = displ
         Catch ex As Exception
-            ClassLogger.Add(">> Unexpected Error in File-Work Info: " & ex.Message, False)
+            LOGGER.Warn("Unexpected Error in File-Work Info: " & ex.Message)
             docCM_InWork.Enabled = False
         End Try
     End Sub
@@ -6275,7 +6287,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
                                 MsgBox(msg, MsgBoxStyle.Information)
                                 Continue For
                             End If
-                            ClassLogger.Add(String.Format("Relinking entity of record '{0}' to entity '{1}'?", _RECORD, ENTITY_STRING.ToString), False)
+                            LOGGER.Info(String.Format("Relinking entity of record '{0}' to entity '{1}'?", _RECORD, ENTITY_STRING.ToString))
 
                             Dim upd = String.Format("UPDATE TBPMO_RECORD SET FORM_ID = {0} where GUID = {1}", node_tag, _RECORD)
                             If ClassDatabase.Execute_non_Query(upd) = True Then
@@ -6671,7 +6683,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
             If RECORD_CREATE = True Then
                 Dim recordId = ClassRecordCommands.CreateRecordProcedure(ENTITY_ID)
                 If recordId = 0 Then
-                    ClassLogger.Add("Error in ADD_NODE: Could not create Record", True)
+                    LOGGER.Warn("Error in ADD_NODE: Could not create Record", True)
                     ClassHelper.MSGBOX_Handler("ERROR", "Error in ADD_NODE", "Could not create Record")
                     Exit Sub
                 Else
@@ -6772,7 +6784,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
                     If USER_IS_ADMIN = False Then
                         ContextMenu_Read()
                     Else
-                        ClassLogger.Add(">> OpenFile.FileRight is R but User is Admin!! - Check the configuration!", False)
+                        LOGGER.Warn("OpenFile.FileRight is R but User is Admin!! - Check the configuration!")
                     End If
                     allow_Open = True
                 Case "RW"
@@ -6903,7 +6915,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
                         If USER_IS_ADMIN = False Then
                             ContextMenu_Read()
                         Else
-                            ClassLogger.Add(">>cmsRFB_O.FileRight is R but User is Admin!! - Check the configuration!", False)
+                            LOGGER.Warn(">>cmsRFB_O.FileRight is R but User is Admin!! - Check the configuration!")
                         End If
                     Case Else
                         ContextMenu_Write()
@@ -7157,7 +7169,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
             ''    For Each oProcess As Process In Process.GetProcesses()
             ''        If oProcess.Id = oDatarow.Item("PROCESS_ID") Then
             ''            'process found so it's running so return true
-            ''            If LogErrorsOnly = False Then ClassLogger.Add($"Process {oProcess.ProcessName} still running - {oProcess.Id.ToString}", False)
+            ''            LOGGER.Debug($"Process {oProcess.ProcessName} still running - {oProcess.Id.ToString}")
             ''            exists = True
             ''        End If
             ''    Next
@@ -7180,28 +7192,28 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
             '    Dim oFileExists = ClassDatabase.Execute_Scalar(oSql, False)
             '    If oFileExists = 0 Then
             '        CURRENT_OFFICE_FILE_CHANGED = True
-            '        ClassLogger.Add($"The docId [{oDocID}] of handled file {oDocPath} changed during editing mode!", False)
+            '        LOGGER.Info($"The docId [{oDocID}] of handled file {oDocPath} changed during editing mode!")
             '        oSql = $"SELECT MAX(dwDocID) FROM windream60.dbo.BaseAttributes WHERE dwVersionID = {oVersionID}"
             '        Dim oNEW_DOC As DataTable = ClassDatabase.Return_Datatable(oSql, False)
             '        If oNEW_DOC.Rows.Count = 1 And Not IsDBNull(oNEW_DOC.Rows(0).Item(0)) Then
             '            Dim oNEWDocID = oNEW_DOC.Rows(0).Item(0)
-            '            ClassLogger.Add($"New DocID is: {oNEWDocID}!!", False)
+            '            LOGGER.Info($"New DocID is: {oNEWDocID}!!")
             '            oSql = $"EXEC PRPMO_DOC_CHANGE_DOCID {oDocID},{oNEWDocID},'{USER_USERNAME}'"
-            '            If LogErrorsOnly = False Then ClassLogger.Add(oSql, False)
+            '            LOGGER.Debug(oSql)
-            '            If ClassDatabase.Execute_non_Query(oSql, False) = False Then
+            '            If ClassDatabase.Execute_non_Query(oSql) = False Then
-            '                ClassLogger.Add($"Could not relink the DocID!!", False)
+            '                LOGGER.Info($"Could not relink the DocID!!")
             '            Else
             '                oSql = $"UPDATE TBPMO_DOC_ID_CHANGED SET NEW_DOC_ID = {oNEWDocID}, CHANGED_WHEN = GETDATE() WHERE GUID = {oGUID}"
-            '                ClassDatabase.Execute_non_Query(oSql, False)
+            '                ClassDatabase.Execute_non_Query(oSql)
             '            End If
             '        Else
-            '            ClassLogger.Add($"Could not get the new DOCID [{oSql}]!!", False)
+            '            LOGGER.Info($"Could not get the new DOCID [{oSql}]!!")
             '        End If
             '    End If
             '    'End If
             'Next
         Catch ex As Exception
-            ClassLogger.Add($"Unexpected error in TimerFileHandleTick [{ex.Message}]!!", True)
+            LOGGER.Warn($"Unexpected error in TimerFileHandleTick [{ex.Message}]!!")
         End Try
     End Sub
 
@@ -7365,11 +7377,32 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
         frmRecord_Changes.ShowDialog()
     End Sub
 
-    Private Sub OfficeVorlagentsmi_Click(sender As Object, e As EventArgs)
 
+
+    Private Sub ExportNachExcelToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ExportNachExcelToolStripMenuItem.Click
+        Dim saveFileDialog1 As New SaveFileDialog
+        saveFileDialog1.Filter = "Excel File|*.xlsx"
+        saveFileDialog1.Title = "Export to Excel:"
+        saveFileDialog1.ShowDialog()
+        If saveFileDialog1.FileName <> "" Then
+            Cursor = Cursors.WaitCursor
+            GridControlDocSearch.MainView.ExportToXlsx(saveFileDialog1.FileName)
+            Dim result As MsgBoxResult
+            Dim msg = String.Format("Datei wurde erstellt! Wollen Sie diese nun öffnen?")
+
+            If USER_LANGUAGE <> "de-DE" Then
+                msg = String.Format("File was created. Do You want to open excel?")
+            End If
+            result = MessageBox.Show(msg, "Exporting result:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+            If result = MsgBoxResult.Yes Then
+                Process.Start(saveFileDialog1.FileName)
+            End If
+        End If
+        Cursor = Cursors.Default
     End Sub
 
-    Private Sub BarEditItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarEditItem2.ItemClick
+    Private Sub EntitätsweiteSucheToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EntitätsweiteSucheToolStripMenuItem.Click
-
+        CURRENT_SEARCH_TYPE = "ENTITY"
+        RUN_ENTITY_DOC_SEARCH()
     End Sub
 End Class

app/DD-Record-Organizer/frmDocLink_Record_Entities.vb

@@ -145,7 +145,7 @@ Public Class frmDocLink_Record_Entities
             Dim ResultSQL, ResultViewName As String
             Dim RecordId As Integer
 
-            If LogErrorsOnly = False Then ClassLogger.Add(" >> GridType = Grid", False)
+            LOGGER.Debug("GridType = Grid", False)
             ResultViewName = "VWPMO_ENTITY_TABLE" & FormId.ToString
             ResultSQL = "SELECT T.* FROM " & ResultViewName & " T"
 
@@ -164,11 +164,11 @@ Public Class frmDocLink_Record_Entities
 
                 Return ResultSQL
             Catch ex As Exception
-                ClassLogger.Add("Error in Get_Grid_Sql in LinkToRecord: " & vbNewLine & ex.Message, True)
+                LOGGER.Warn("Error in Get_Grid_Sql in LinkToRecord: " & vbNewLine & ex.Message)
                 MsgBox("Error in Get_Grid_Sql in LinkToRecord: " & vbNewLine & ex.Message)
             End Try
         Catch ex As Exception
-            ClassLogger.Add("Error in Get_Grid_Sql: " & vbNewLine & ex.Message, True)
+            LOGGER.Warn("Error in Get_Grid_Sql: " & vbNewLine & ex.Message)
             MsgBox("Error in Get_Grid_Sql: " & vbNewLine & ex.Message)
         End Try
     End Function
@@ -294,7 +294,7 @@ Public Class frmDocLink_Record_Entities
                     NODE_NAVIGATION_LOADED = True
                 End If
 
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> NodeTag: " & SelectedNode.Tag.ToString, False)
+                LOGGER.Debug("NodeTag: " & SelectedNode.Tag.ToString, False)
                 If SelectedNode.Tag.ToString.Contains("RECORD-ID") Then
                     Dim Record = ClassNodeNavigation.Return_RECORD_forTag(SelectedNode.Tag)
                     If Record <> 0 Then

app/DD-Record-Organizer/frmDocRecordLink.vb

@@ -121,7 +121,7 @@ Public Class frmDocRecordLink
             If IsNothing(SELECTED_RECORDID) Then
                 Continue For
             End If
-            If LogErrorsOnly = False Then ClassLogger.Add(">>> Doc will be linked with Record: " & SELECTED_RECORDID.ToString, False)
+            LOGGER.Debug(">>> Doc will be linked with Record: " & SELECTED_RECORDID.ToString, False)
             Try
                 For Each row As DataRow In CURRENT_DT_SELECTED_FILES.Rows
                     CURRENT_DOC_ID = row.Item("DOC_ID")
@@ -153,11 +153,11 @@ Public Class frmDocRecordLink
                         Dim ENT_ID = ClassDatabase.Execute_Scalar(String.Format("SELECT FORM_ID FROM TBPMO_RECORD WHERE GUID = {0}", SELECTED_RECORDID))
                         If ENT_ID > 1 And Entity_Index <> String.Empty Then
                             If clsWD_SET.IndexFile(DOC_PATH, Entity_Index, ENT_ID, _objecttype) = False Then
-                                Dim msg = "Die Entität-ID konnte nicht gesetzt werden! Bitte überprüfen Sie die Logfile"
+                                'Dim msg = "Die Entität-ID konnte nicht gesetzt werden! Bitte überprüfen Sie die Logfile"
-                                If USER_LANGUAGE <> "de-DE" Then
+                                'If USER_LANGUAGE <> "de-DE" Then
-                                    msg = "Could not index Entity-ID! Please check logfile!"
+                                '    msg = "Could not index Entity-ID! Please check logfile!"
-                                End If
+                                'End If
-                                MsgBox(msg, MsgBoxStyle.Exclamation)
+                                'MsgBox(msg, MsgBoxStyle.Exclamation)
                             End If
                         End If
                         If Record_Index <> String.Empty Then
@@ -226,11 +226,11 @@ Public Class frmDocRecordLink
             ENTITY_LOAD_ACTIVE = True
             Save_DocGrid_Layout()
             Dim ResultSQL, ResultViewName As String
-            If LogErrorsOnly = False Then ClassLogger.Add(" >> GridType = Grid", False)
+            LOGGER.Debug("GridType = Grid", False)
             ResultViewName = $"VWPMO_ENTITY_TABLE{entity.id}"
             ResultSQL = $"SELECT T.* FROM {ResultViewName} T"
             txtEntity.Text = cmbConstructorForms.Text
-            If LogErrorsOnly = False Then ClassLogger.Add(" >> ResultSQL: " & ResultSQL, False)
+            LOGGER.Debug("ResultSQL: " & ResultSQL, False)
             Me.Cursor = Cursors.WaitCursor
             Dim DT_RESULT = clsDatabase.Return_Datatable(ResultSQL, True)
             If Not IsNothing(DT_RESULT) Then

app/DD-Record-Organizer/frmDocSearchResult.Designer.vb

@@ -23,13 +23,14 @@ Partial Class frmDocSearchResult
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
-        Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
+        Dim GridLevelNode2 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmDocSearchResult))
         Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
         Me.tslblDocID = New System.Windows.Forms.ToolStripStatusLabel()
         Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
         Me.ToolStripLabelCaption = New System.Windows.Forms.ToolStripLabel()
         Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
+        Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton()
         Me.GridControlDocSearch = New DevExpress.XtraGrid.GridControl()
         Me.ContextMenuStripResultFiles = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.docCM_Open = New System.Windows.Forms.ToolStripMenuItem()
@@ -41,6 +42,7 @@ Partial Class frmDocSearchResult
         Me.docCM_PropertiesFile = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator25 = New System.Windows.Forms.ToolStripSeparator()
         Me.GridViewDoc_Search = New DevExpress.XtraGrid.Views.Grid.GridView()
+        Me.ToolStripButton3 = New System.Windows.Forms.ToolStripButton()
         Me.StatusStrip1.SuspendLayout()
         Me.ToolStrip1.SuspendLayout()
         CType(Me.GridControlDocSearch, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -65,7 +67,7 @@ Partial Class frmDocSearchResult
         '
         'ToolStrip1
         '
-        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripLabelCaption, Me.ToolStripButton1})
+        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripLabelCaption, Me.ToolStripButton1, Me.ToolStripButton2, Me.ToolStripButton3})
         Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
         Me.ToolStrip1.Name = "ToolStrip1"
         Me.ToolStrip1.Size = New System.Drawing.Size(1083, 25)
@@ -75,7 +77,7 @@ Partial Class frmDocSearchResult
         'ToolStripLabelCaption
         '
         Me.ToolStripLabelCaption.Name = "ToolStripLabelCaption"
-        Me.ToolStripLabelCaption.Size = New System.Drawing.Size(88, 22)
+        Me.ToolStripLabelCaption.Size = New System.Drawing.Size(87, 22)
         Me.ToolStripLabelCaption.Text = "ToolStripLabel1"
         '
         'ToolStripButton1
@@ -87,12 +89,21 @@ Partial Class frmDocSearchResult
         Me.ToolStripButton1.Size = New System.Drawing.Size(95, 22)
         Me.ToolStripButton1.Text = "Aktualisieren"
         '
+        'ToolStripButton2
+        '
+        Me.ToolStripButton2.Image = Global.DD_Record_Organizer.My.Resources.Resources.Excel_25ixel
+        Me.ToolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.ToolStripButton2.Name = "ToolStripButton2"
+        Me.ToolStripButton2.Size = New System.Drawing.Size(120, 22)
+        Me.ToolStripButton2.Text = "Export nach Excel"
+        Me.ToolStripButton2.ToolTipText = "Export nach Excel"
+        '
         'GridControlDocSearch
         '
         Me.GridControlDocSearch.ContextMenuStrip = Me.ContextMenuStripResultFiles
         Me.GridControlDocSearch.Dock = System.Windows.Forms.DockStyle.Fill
-        GridLevelNode1.RelationName = "Level1"
+        GridLevelNode2.RelationName = "Level1"
-        Me.GridControlDocSearch.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1})
+        Me.GridControlDocSearch.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode2})
         Me.GridControlDocSearch.Location = New System.Drawing.Point(0, 25)
         Me.GridControlDocSearch.MainView = Me.GridViewDoc_Search
         Me.GridControlDocSearch.Name = "GridControlDocSearch"
@@ -116,6 +127,7 @@ Partial Class frmDocSearchResult
         '
         'OrdnerÖffnenToolStripMenuItem
         '
+        Me.OrdnerÖffnenToolStripMenuItem.Image = Global.DD_Record_Organizer.My.Resources.Resources.folder_Open_16xLG
         Me.OrdnerÖffnenToolStripMenuItem.Name = "OrdnerÖffnenToolStripMenuItem"
         Me.OrdnerÖffnenToolStripMenuItem.Size = New System.Drawing.Size(255, 26)
         Me.OrdnerÖffnenToolStripMenuItem.Text = "Ordner öffnen"
@@ -146,7 +158,7 @@ Partial Class frmDocSearchResult
         '
         'docCM_PropertiesFile
         '
-        Me.docCM_PropertiesFile.Image = Global.DD_Record_Organizer.My.Resources.Resources.PropertyGridEditorPart_6041
+        Me.docCM_PropertiesFile.Image = Global.DD_Record_Organizer.My.Resources.Resources.Property_501
         Me.docCM_PropertiesFile.Name = "docCM_PropertiesFile"
         Me.docCM_PropertiesFile.Size = New System.Drawing.Size(255, 26)
         Me.docCM_PropertiesFile.Text = "Eigenschaften Datei"
@@ -177,6 +189,14 @@ Partial Class frmDocSearchResult
         Me.GridViewDoc_Search.OptionsView.ShowAutoFilterRow = True
         Me.GridViewDoc_Search.OptionsView.ShowHorizontalLines = DevExpress.Utils.DefaultBoolean.[True]
         '
+        'ToolStripButton3
+        '
+        Me.ToolStripButton3.Image = Global.DD_Record_Organizer.My.Resources.Resources.delete
+        Me.ToolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.ToolStripButton3.Name = "ToolStripButton3"
+        Me.ToolStripButton3.Size = New System.Drawing.Size(134, 22)
+        Me.ToolStripButton3.Text = "Layout zurücksetzen"
+        '
         'frmDocSearchResult
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -217,4 +237,6 @@ Partial Class frmDocSearchResult
     Friend WithEvents docCM_PropertiesFile As ToolStripMenuItem
     Friend WithEvents ToolStripSeparator25 As ToolStripSeparator
     Friend WithEvents ToolStripButton1 As ToolStripButton
+    Friend WithEvents ToolStripButton2 As ToolStripButton
+    Friend WithEvents ToolStripButton3 As ToolStripButton
 End Class

app/DD-Record-Organizer/frmDocSearchResult.resx

@@ -124,7 +124,7 @@
     <value>134, 17</value>
   </metadata>
   <metadata name="ContextMenuStripResultFiles.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>799, 56</value>
+    <value>241, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="docCM_Showlinks.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

app/DD-Record-Organizer/frmDocSearchResult.vb

@@ -7,6 +7,7 @@ Public Class frmDocSearchResult
     <DllImport("Shell32", CharSet:=CharSet.Auto, SetLastError:=True)>
     Public Shared Function ShellExecuteEx(ByRef lpExecInfo As SHELLEXECUTEINFO) As Boolean
     End Function
+
     Public Structure SHELLEXECUTEINFO
         Public cbSize As Integer
         Public fMask As Integer
@@ -28,19 +29,32 @@ Public Class frmDocSearchResult
     Private Const SEE_MASK_NOCLOSEPROCESS = &H40
     Private Const SEE_MASK_FLAG_NO_UI = &H400
     Public Const SW_SHOW As Short = 5
-    Public Sub LoadDocSearch()
+    Private DT_RESULT As DataTable
+    Public Sub LoadDocSearch(reload As Boolean)
         Try
             Cursor = Cursors.WaitCursor
 
-            Dim DTRESULT As DataTable = ClassDatabase.Return_Datatable(CURRENT_DOCSEARCH_SQL, True)
+            If reload = False Then
+                DT_RESULT = ClassDatabase.Return_Datatable(CURRENT_DOCSEARCH_SQL, True)
+            End If
+
+            DT_RESULT = DT_RESULT
             GridControlDocSearch.DataSource = Nothing
             GridViewDoc_Search.Columns.Clear()
-            GridControlDocSearch.DataSource = DTRESULT
+            GridControlDocSearch.DataSource = DT_RESULT
             GridViewDoc_Search.BestFitColumns(True)
-            ToolStripLabelCaption.Text = $"{CURRENT_DOCSEARCH_CAPTION} ({DTRESULT.Rows.Count} rows)"
+            ToolStripLabelCaption.Text = $"{CURRENT_DOCSEARCH_CAPTION} ({DT_RESULT.Rows.Count} rows)"
             Load_DocGrid_Layout()
+            GridControlDocSearch.DataSource = DT_RESULT
+            GridControlDocSearch.DataSource = DT_RESULT
+            'If GridViewDoc_Search.RowCount > 15000 Then
+            '    ToolStripButton2.Enabled = False
+            'Else
+            '    ToolStripButton2.Enabled = True
+            'End If
+            ToolStripButton2.Enabled = True
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in LoadDocSearch: " & ex.Message)
+            LOGGER.Warn("Unexpected Error in LoadDocSearch: " & ex.Message)
         End Try
         Cursor = Cursors.Default
 
@@ -92,7 +106,7 @@ Public Class frmDocSearchResult
             End If
             For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
                 ClassHelper.File_open(row.Item("DOC_PATH"), row.Item("DOC_ID"))
-                If CURRENT_OFFICE_FILE_CHANGED = True Then LoadDocSearch()
+                If CURRENT_OFFICE_FILE_CHANGED = True Then LoadDocSearch(True)
             Next
         Else
             ClassHelper.MSGBOX_Handler("ERROR", "", "File does not exist! Please contact your admin!")
@@ -174,7 +188,7 @@ Public Class frmDocSearchResult
     End Sub
 
     Private Sub frmDocSearchResult_Load(sender As Object, e As EventArgs) Handles Me.Load
-        LoadDocSearch()
+        LoadDocSearch(False)
         Me.Text = CURRENT_DOCSEARCH_CAPTION
     End Sub
     Sub Save_DocGrid_Layout()
@@ -216,9 +230,49 @@ Public Class frmDocSearchResult
 
     Private Sub GridViewDoc_Search_ColumnFilterChanged(sender As Object, e As EventArgs) Handles GridViewDoc_Search.ColumnFilterChanged
         ToolStripLabelCaption.Text = $"{CURRENT_DOCSEARCH_CAPTION} ({GridViewDoc_Search.RowCount} rows [filtered])"
+        If GridViewDoc_Search.RowCount > 12000 Then
+            ToolStripButton2.Enabled = False
+        Else
+            ToolStripButton2.Enabled = True
+        End If
     End Sub
 
     Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click
-        LoadDocSearch()
+        LoadDocSearch(False)
+    End Sub
+
+    Private Sub ToolStripButton2_Click(sender As Object, e As EventArgs) Handles ToolStripButton2.Click
+        Try
+            Dim saveFileDialogDocSearchResult As New SaveFileDialog
+            saveFileDialogDocSearchResult.Filter = "Excel File|*.xlsx"
+            saveFileDialogDocSearchResult.Title = "Export to Excel:"
+            saveFileDialogDocSearchResult.ShowDialog()
+            If saveFileDialogDocSearchResult.FileName <> "" Then
+                Cursor = Cursors.WaitCursor
+                GridControlDocSearch.MainView.ExportToXlsx(saveFileDialogDocSearchResult.FileName)
+                Dim result As MsgBoxResult
+                Dim msg = String.Format("Datei wurde erstellt! Wollen Sie diese nun öffnen?")
+
+                If USER_LANGUAGE <> "de-DE" Then
+                    msg = String.Format("File was created. Do You want to open excel?")
+                End If
+                result = MessageBox.Show(msg, "Exporting result:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+                If result = MsgBoxResult.Yes Then
+                    Process.Start(saveFileDialogDocSearchResult.FileName)
+                End If
+            End If
+
+        Catch ex As Exception
+            MsgBox("Unexpected Error in ExportExcel: " & ex.Message, MsgBoxStyle.Critical)
+        End Try
+        Cursor = Cursors.Default
+    End Sub
+
+    Private Sub ToolStripButton3_Click(sender As Object, e As EventArgs) Handles ToolStripButton3.Click
+        Dim XMLPath = Get_DocGrid_Layout_Filename()
+        If File.Exists(XMLPath) Then
+            File.Delete(XMLPath)
+            LoadDocSearch(True)
+        End If
     End Sub
 End Class

app/DD-Record-Organizer/frmDoc_Links.vb

@@ -46,7 +46,7 @@ Public Class frmDoc_Links
             If IsNothing(oDocID) Then
                 Continue For
             End If
-            If LogErrorsOnly = False Then ClassLogger.Add($">> RecordLink will be removed Record: {oRECORD_ID} - DocID: {oDocID} ", False)
+            LOGGER.Debug($"RecordLink will be removed Record: {oRECORD_ID} - DocID: {oDocID} ")
             Try
                 If ClassFileResult.Delete_ResultFile(oDocID, oRECORD_ID, 0) = True Then
                     ClassHelper.InsertEssential_Log(oDocID, "DOC-ID", $"RECORD LINK {oRECORD_ID} REMOVED FROM DOC-SEARCH")

app/DD-Record-Organizer/frmEntities.vb

@@ -50,7 +50,7 @@ Public Class frmEntities
         Try
             Dim DT_SQL = String.Format("SELECT T.GUID, T1.FORM_TITLE,[dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), T1.GUID), {1}) AS 'CAPTION' FROM " & _
                                        "TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.GUID = T1.FORM_ID AND T.FORM_TYPE_ID = 1 AND T.PARENT_ID = 0 AND T.GUID IN (select DISTINCT ENTITY_ID FROM TBPMO_CLIENT_ENTITY WHERE CLIENT_ID IN (select client_Id from TBDD_CLIENT_USER where USER_ID = {2}))", USER_LANGUAGE, CURRENT_SCREEN_ID, USER_GUID)
-            If LogErrorsOnly = False Then ClassLogger.Add(Now.ToString & ">> Level 0 >>" & DT_SQL, False)
+            LOGGER.Debug(Now.ToString & "Level 0 >>" & DT_SQL, False)
 
             Dim DT As DataTable = ClassDatabase.Return_Datatable(DT_SQL)
             If DT.Rows.Count > 0 Then
@@ -63,7 +63,7 @@ Public Class frmEntities
                     'Jetzt die Ebene1Knoten einhängen
                     DT_SQL = String.Format("SELECT T.GUID, T1.FORM_TITLE,[dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), T1.GUID), {1}) AS 'CAPTION' FROM " &
                                            "TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.GUID = T1.FORM_ID AND T.FORM_TYPE_ID in (2,5) AND T.PARENT_ID IN ({2},0) AND T.GUID IN (select DISTINCT ENTITY_ID FROM TBPMO_CLIENT_ENTITY WHERE CLIENT_ID IN (select client_Id from TBDD_CLIENT_USER where USER_ID = {3})) ORDER BY LEVEL", USER_LANGUAGE, CURRENT_SCREEN_ID, Row.Item("GUID"), USER_GUID)
-                    If LogErrorsOnly = False Then ClassLogger.Add(Now.ToString & ">> Level 1 >>" & DT_SQL, False)
+                    LOGGER.Debug(Now.ToString & "Level 1 >>" & DT_SQL, False)
                     'Dim sql As String = "SELECT T.GUID, T1.FORM_TITLE FROM TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.GUID = T1.FORM_ID AND T.FORM_TYPE_ID in (2,5) AND T.PARENT_ID = " & Row.Item("GUID") & " ORDER BY LEVEL"
                     Dim dtEbene1 As DataTable = ClassDatabase.Return_Datatable(DT_SQL)
                     If dtEbene1.Rows.Count > 0 Then
@@ -73,7 +73,7 @@ Public Class frmEntities
                             Node1.Tag = row1.Item("GUID")
                             DT_SQL = String.Format("SELECT T.GUID, T1.FORM_TITLE,[dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), T1.GUID), {1}) AS 'CAPTION' FROM " & _
                                                    "TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.GUID = T1.FORM_ID AND T.FORM_TYPE_ID in (3,5) AND T.PARENT_ID = {2} AND T.GUID IN (select DISTINCT ENTITY_ID FROM TBPMO_CLIENT_ENTITY WHERE CLIENT_ID IN (select client_Id from TBDD_CLIENT_USER where USER_ID = {3})) ORDER BY LEVEL", USER_LANGUAGE, CURRENT_SCREEN_ID, row1.Item("GUID"), USER_GUID)
-                            If LogErrorsOnly = False Then ClassLogger.Add(Now.ToString & ">> Level 2 >>" & DT_SQL, False)
+                            LOGGER.Debug(Now.ToString & "Level 2 >>" & DT_SQL, False)
                             ' Dim sql1 As String = "SELECT T.GUID, T1.FORM_TITLE FROM TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.GUID = T1.FORM_ID AND T.FORM_TYPE_ID in (3,5) AND T.PARENT_ID = " & row1.Item("GUID") & " ORDER BY LEVEL"
                             'Jetzt die Ebene2 Knoten einhängen
                             Dim dtEbene2 As DataTable = ClassDatabase.Return_Datatable(DT_SQL)
@@ -93,7 +93,7 @@ Public Class frmEntities
                                        "FROM TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.GUID = T1.FORM_ID AND T.FORM_TYPE_ID = 4 AND T.PARENT_ID = 0 AND T.GUID IN (select DISTINCT ENTITY_ID FROM TBPMO_CLIENT_ENTITY WHERE CLIENT_ID IN (select client_Id from TBDD_CLIENT_USER where USER_ID = {2})) ORDER BY CAPTION", USER_LANGUAGE, CURRENT_SCREEN_ID, USER_GUID)
                 'Dim sql2 As String = "SELECT T.GUID, T1.FORM_TITLE FROM TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.GUID = T1.FORM_ID AND T.FORM_TYPE_ID = 4 AND T.PARENT_ID = 0 ORDER BY T1.FORM_TITLE"
                 Dim DT3 As DataTable = ClassDatabase.Return_Datatable(DT_SQL)
-                If LogErrorsOnly = False Then ClassLogger.Add(Now.ToString & ">> Indepentent Entities >>" & DT_SQL, False)
+                LOGGER.Debug(Now.ToString & "Indepentent Entities >>" & DT_SQL, False)
                 If DT3.Rows.Count > 0 Then
                     Dim Node As TreeNode
                     Node = TreeViewEntity.Nodes.Add("INDEPENDENT ENTITIES")
@@ -209,7 +209,7 @@ Public Class frmEntities
             Dim XMLPath = System.IO.Path.Combine(Application.UserAppDataPath(), "FORM-OVERVIEW-UserLayout.xml")
             '  treeListForms.RestoreLayoutFromXml(XMLPath)
         Catch notFoundEx As System.IO.FileNotFoundException
-            ClassLogger.Add("Layout added for Overview")
+            LOGGER.Warn("Layout added for Overview")
         Catch ex As Exception
             MsgBox("Error while loading custom Layout!" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try

app/DD-Record-Organizer/frmGlobalSearch.Designer.vb

@@ -36,6 +36,10 @@ Partial Class frmGlobalSearch
         Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
         Me.tsbtnviewDetail = New System.Windows.Forms.ToolStripButton()
         Me.GridControlFiles = New DevExpress.XtraGrid.GridControl()
+        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.DateiÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.OrdnerÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.EigenschaftenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.GridViewFiles = New DevExpress.XtraGrid.Views.Grid.GridView()
         Me.ToolStripDokumente = New System.Windows.Forms.ToolStrip()
         Me.tslblDocView = New System.Windows.Forms.ToolStripLabel()
@@ -51,6 +55,7 @@ Partial Class frmGlobalSearch
         Me.txtSearch = New System.Windows.Forms.TextBox()
         Me.Label2 = New System.Windows.Forms.Label()
         Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+        Me.VerknüpfungenAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SplitContainerMain.SuspendLayout()
         CType(Me.GridControlRecords, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -58,6 +63,7 @@ Partial Class frmGlobalSearch
         CType(Me.GridViewRecords, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.ToolStripRecords.SuspendLayout()
         CType(Me.GridControlFiles, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.ContextMenuStrip1.SuspendLayout()
         CType(Me.GridViewFiles, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.ToolStripDokumente.SuspendLayout()
         Me.ToolStripMain.SuspendLayout()
@@ -106,7 +112,7 @@ Partial Class frmGlobalSearch
         '
         'GridViewRecords
         '
-        Me.GridViewRecords.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridViewRecords.Appearance.EvenRow.BackColor"), System.Drawing.Color)
+        Me.GridViewRecords.Appearance.EvenRow.BackColor = System.Drawing.Color.Aqua
         Me.GridViewRecords.Appearance.EvenRow.Options.UseBackColor = True
         Me.GridViewRecords.GridControl = Me.GridControlRecords
         Me.GridViewRecords.Name = "GridViewRecords"
@@ -152,14 +158,38 @@ Partial Class frmGlobalSearch
         '
         'GridControlFiles
         '
+        Me.GridControlFiles.ContextMenuStrip = Me.ContextMenuStrip1
         resources.ApplyResources(Me.GridControlFiles, "GridControlFiles")
         Me.GridControlFiles.MainView = Me.GridViewFiles
         Me.GridControlFiles.Name = "GridControlFiles"
         Me.GridControlFiles.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewFiles})
         '
+        'ContextMenuStrip1
+        '
+        Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiÖffnenToolStripMenuItem, Me.OrdnerÖffnenToolStripMenuItem, Me.EigenschaftenToolStripMenuItem, Me.VerknüpfungenAnzeigenToolStripMenuItem})
+        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
+        resources.ApplyResources(Me.ContextMenuStrip1, "ContextMenuStrip1")
+        '
+        'DateiÖffnenToolStripMenuItem
+        '
+        Me.DateiÖffnenToolStripMenuItem.Name = "DateiÖffnenToolStripMenuItem"
+        resources.ApplyResources(Me.DateiÖffnenToolStripMenuItem, "DateiÖffnenToolStripMenuItem")
+        '
+        'OrdnerÖffnenToolStripMenuItem
+        '
+        Me.OrdnerÖffnenToolStripMenuItem.Image = Global.DD_Record_Organizer.My.Resources.Resources.folder_Open_16xLG
+        Me.OrdnerÖffnenToolStripMenuItem.Name = "OrdnerÖffnenToolStripMenuItem"
+        resources.ApplyResources(Me.OrdnerÖffnenToolStripMenuItem, "OrdnerÖffnenToolStripMenuItem")
+        '
+        'EigenschaftenToolStripMenuItem
+        '
+        Me.EigenschaftenToolStripMenuItem.Image = Global.DD_Record_Organizer.My.Resources.Resources.Property_501
+        Me.EigenschaftenToolStripMenuItem.Name = "EigenschaftenToolStripMenuItem"
+        resources.ApplyResources(Me.EigenschaftenToolStripMenuItem, "EigenschaftenToolStripMenuItem")
+        '
         'GridViewFiles
         '
-        Me.GridViewFiles.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridViewFiles.Appearance.EvenRow.BackColor"), System.Drawing.Color)
+        Me.GridViewFiles.Appearance.EvenRow.BackColor = System.Drawing.Color.Orange
         Me.GridViewFiles.Appearance.EvenRow.Options.UseBackColor = True
         Me.GridViewFiles.GridControl = Me.GridControlFiles
         Me.GridViewFiles.Name = "GridViewFiles"
@@ -266,6 +296,12 @@ Partial Class frmGlobalSearch
         Me.GroupBox1.Name = "GroupBox1"
         Me.GroupBox1.TabStop = False
         '
+        'VerknüpfungenAnzeigenToolStripMenuItem
+        '
+        Me.VerknüpfungenAnzeigenToolStripMenuItem.Image = Global.DD_Record_Organizer.My.Resources.Resources.Link
+        Me.VerknüpfungenAnzeigenToolStripMenuItem.Name = "VerknüpfungenAnzeigenToolStripMenuItem"
+        resources.ApplyResources(Me.VerknüpfungenAnzeigenToolStripMenuItem, "VerknüpfungenAnzeigenToolStripMenuItem")
+        '
         'frmGlobalSearch
         '
         resources.ApplyResources(Me, "$this")
@@ -282,6 +318,7 @@ Partial Class frmGlobalSearch
         Me.ToolStripRecords.ResumeLayout(False)
         Me.ToolStripRecords.PerformLayout()
         CType(Me.GridControlFiles, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.ContextMenuStrip1.ResumeLayout(False)
         CType(Me.GridViewFiles, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ToolStripDokumente.ResumeLayout(False)
         Me.ToolStripDokumente.PerformLayout()
@@ -321,4 +358,9 @@ Partial Class frmGlobalSearch
     Friend WithEvents ShowRecordToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents Panel1 As System.Windows.Forms.Panel
     Friend WithEvents tsbtnviewDetail As System.Windows.Forms.ToolStripButton
+    Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
+    Friend WithEvents DateiÖffnenToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents OrdnerÖffnenToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents EigenschaftenToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents VerknüpfungenAnzeigenToolStripMenuItem As ToolStripMenuItem
 End Class

app/DD-Record-Organizer/frmGlobalSearch.resx

@@ -155,9 +155,6 @@
   <data name="GridControlRecords.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 25</value>
   </data>
-  <data name="GridViewRecords.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Aqua</value>
-  </data>
   <data name="GridControlRecords.Size" type="System.Drawing.Size, System.Drawing">
     <value>751, 313</value>
   </data>
@@ -193,7 +190,7 @@
     <value>Magenta</value>
   </data>
   <data name="ToolStripButton1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>60, 22</value>
+    <value>61, 22</value>
   </data>
   <data name="ToolStripButton1.Text" xml:space="preserve">
     <value>Export</value>
@@ -234,17 +231,50 @@
   <data name="SplitContainerMain.Panel1.Text" xml:space="preserve">
     <value>Panel1</value>
   </data>
+  <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>571, 17</value>
+  </metadata>
+  <data name="DateiÖffnenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>205, 22</value>
+  </data>
+  <data name="DateiÖffnenToolStripMenuItem.Text" xml:space="preserve">
+    <value>Datei öffnen</value>
+  </data>
+  <data name="OrdnerÖffnenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>205, 22</value>
+  </data>
+  <data name="OrdnerÖffnenToolStripMenuItem.Text" xml:space="preserve">
+    <value>Ordner öffnen</value>
+  </data>
+  <data name="EigenschaftenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>205, 22</value>
+  </data>
+  <data name="EigenschaftenToolStripMenuItem.Text" xml:space="preserve">
+    <value>Eigenschaften</value>
+  </data>
+  <data name="VerknüpfungenAnzeigenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>205, 22</value>
+  </data>
+  <data name="VerknüpfungenAnzeigenToolStripMenuItem.Text" xml:space="preserve">
+    <value>Verknüpfungen anzeigen</value>
+  </data>
+  <data name="ContextMenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>206, 114</value>
+  </data>
+  <data name="&gt;&gt;ContextMenuStrip1.Name" xml:space="preserve">
+    <value>ContextMenuStrip1</value>
+  </data>
+  <data name="&gt;&gt;ContextMenuStrip1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="GridControlFiles.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
   <data name="GridControlFiles.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 25</value>
   </data>
-  <data name="GridViewFiles.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Orange</value>
-  </data>
   <data name="GridControlFiles.Size" type="System.Drawing.Size, System.Drawing">
-    <value>406, 313</value>
+    <value>408, 313</value>
   </data>
   <data name="GridControlFiles.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
@@ -289,7 +319,7 @@
     <value>0, 0</value>
   </data>
   <data name="ToolStripDokumente.Size" type="System.Drawing.Size, System.Drawing">
-    <value>406, 25</value>
+    <value>408, 25</value>
   </data>
   <data name="ToolStripDokumente.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
@@ -331,7 +361,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;SplitContainerMain.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>2</value>
   </data>
   <metadata name="ToolStripMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
@@ -604,7 +634,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;Panel1.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>3</value>
   </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
@@ -715,6 +745,24 @@
   <data name="&gt;&gt;tsbtnviewDetail.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;DateiÖffnenToolStripMenuItem.Name" xml:space="preserve">
+    <value>DateiÖffnenToolStripMenuItem</value>
+  </data>
+  <data name="&gt;&gt;DateiÖffnenToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;OrdnerÖffnenToolStripMenuItem.Name" xml:space="preserve">
+    <value>OrdnerÖffnenToolStripMenuItem</value>
+  </data>
+  <data name="&gt;&gt;OrdnerÖffnenToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;EigenschaftenToolStripMenuItem.Name" xml:space="preserve">
+    <value>EigenschaftenToolStripMenuItem</value>
+  </data>
+  <data name="&gt;&gt;EigenschaftenToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;GridViewFiles.Name" xml:space="preserve">
     <value>GridViewFiles</value>
   </data>
@@ -739,6 +787,12 @@
   <data name="&gt;&gt;tsbtnRefresh.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;VerknüpfungenAnzeigenToolStripMenuItem.Name" xml:space="preserve">
+    <value>VerknüpfungenAnzeigenToolStripMenuItem</value>
+  </data>
+  <data name="&gt;&gt;VerknüpfungenAnzeigenToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>frmGlobalSearch</value>
   </data>

app/DD-Record-Organizer/frmGlobalSearch.vb

@@ -1,10 +1,35 @@
 Imports DevExpress.Utils
 Imports System.Text
 Imports System.IO
+Imports DevExpress.XtraGrid.Views.Grid
+Imports System.Runtime.InteropServices
 
 Public Class frmGlobalSearch
-
     Inherits Form
+    <DllImport("Shell32", CharSet:=CharSet.Auto, SetLastError:=True)>
+    Public Shared Function ShellExecuteEx(ByRef lpExecInfo As SHELLEXECUTEINFO) As Boolean
+    End Function
+    Public Structure SHELLEXECUTEINFO
+        Public cbSize As Integer
+        Public fMask As Integer
+        Public hwnd As IntPtr
+        <MarshalAs(UnmanagedType.LPTStr)> Public lpVerb As String
+        <MarshalAs(UnmanagedType.LPTStr)> Public lpFile As String
+        <MarshalAs(UnmanagedType.LPTStr)> Public lpParameters As String
+        <MarshalAs(UnmanagedType.LPTStr)> Public lpDirectory As String
+        Dim nShow As Integer
+        Dim hInstApp As IntPtr
+        Dim lpIDList As IntPtr
+        <MarshalAs(UnmanagedType.LPTStr)> Public lpClass As String
+        Public hkeyClass As IntPtr
+        Public dwHotKey As Integer
+        Public hIcon As IntPtr
+        Public hProcess As IntPtr
+    End Structure
+    Private Const SEE_MASK_INVOKEIDLIST = &HC
+    Private Const SEE_MASK_NOCLOSEPROCESS = &H40
+    Private Const SEE_MASK_FLAG_NO_UI = &H400
+    Public Const SW_SHOW As Short = 5
     Private _Helper As ClassHelper
     Dim sel_Records, sel_FT As String
     Private Sub tsbtnRefresh_Click(sender As Object, e As EventArgs) Handles tsbtnRefresh.Click
@@ -52,11 +77,11 @@ Public Class frmGlobalSearch
     Sub PREPARE_FT_SQL()
         Dim sqlft = SQL_FULLTEXT
         sqlft = sqlft.Replace("@FULLTEXT", txtSearch.Text)
-        Dim selDoc = String.Format("SELECT [DocID],[FULL_FILENAME],[Filename],[DISPLAY_NAME],[Doctype],[Creation_DateTime] As CreatedWhen,[Change_DateTime] as ChangedWhen,[IN_WORK] as [InWork?] " &
+        'Dim selDoc = String.Format("SELECT T.[DocID],T.[FULL_FILENAME],T.[Filename],T.[DISPLAY_NAME],T.[Doctype],T.[Creation_DateTime] As CreatedWhen,T.[Change_DateTime] as ChangedWhen,T.[IN_WORK] as [InWork?] " &
-                    "FROM VWPMO_DOC_SEARCH where DocID in " & vbNewLine &
+        '            "FROM VWPMO_DOC_SEARCH T INNER JOIN ( " & vbNewLine &
-                    "({0}) " & vbNewLine &
+        '            "{0}) Y ON  T.DocID = Y.dwDocID " & vbNewLine &
-                    "AND DocID IN (SELECT dwObjectID FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwUserOrGroupID = {1})", sqlft, USERID_FK_INT_ECM)
+        '            "INNER JOIN VWPMO_WD_OBJECT_RIGHTS TRIGHT ON T.DocID = TRIGHT.dwObjectID WHERE TRIGHT.dwUserOrGroupID = {1}", sqlft, USERID_FK_INT_ECM)
-        sel_FT = selDoc
+        sel_FT = sqlft
 
     End Sub
     Sub PREPARE_RECORD_SQL()
@@ -183,20 +208,7 @@ Public Class frmGlobalSearch
     End Sub
 
     Private Sub GridControlFiles_DoubleClick(sender As Object, e As EventArgs) Handles GridControlFiles.DoubleClick
-        Me.Cursor = Cursors.WaitCursor
+        File_open()
-
-        For Each row In GridViewFiles.GetSelectedRows
-            Dim SELECTED_DOC_PATH = _Helper.FORMAT_WM_PATH(GridViewFiles.GetRowCellValue(row, "FULL_FILENAME"))
-            Dim SELECTED_DOC_ID = GridViewFiles.GetRowCellValue(row, "DocID")
-            If IsNothing(SELECTED_DOC_PATH) Then
-                MsgBox("Could not read File Parameters!", MsgBoxStyle.Exclamation)
-                Exit Sub
-            End If
-
-            ClassHelper.File_open(SELECTED_DOC_PATH, SELECTED_DOC_ID)
-
-        Next
-        Me.Cursor = Cursors.Default
     End Sub
     Sub Save_DocGrid_Layout()
         Try
@@ -256,4 +268,99 @@ Public Class frmGlobalSearch
         Load_DocGrid_Layout()
         Load_RecordGrid_Layout()
     End Sub
+    Sub Show_File_Properties()
+        Try
+            For Each row In GridViewFiles.GetSelectedRows
+                Dim SELECTED_DOC_PATH = _Helper.FORMAT_WM_PATH(GridViewFiles.GetRowCellValue(row, "FULL_FILENAME"))
+                Dim SELECTED_DOC_ID = GridViewFiles.GetRowCellValue(row, "DocID")
+
+                Cursor = Cursors.WaitCursor
+                Dim sei As New SHELLEXECUTEINFO
+                sei.cbSize = Marshal.SizeOf(sei)
+                sei.lpVerb = "properties"
+                sei.lpFile = SELECTED_DOC_PATH
+                sei.nShow = SW_SHOW
+                sei.fMask = SEE_MASK_INVOKEIDLIST
+                If Not ShellExecuteEx(sei) Then
+                    Dim ex As New System.ComponentModel.Win32Exception(System.Runtime.InteropServices.Marshal.GetLastWin32Error())
+                    ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Open file propertys:", ex.Message)
+                End If
+            Next
+
+        Catch ex As Exception
+            LOGGER.Error(ex)
+            MsgBox(ex.Message, MsgBoxStyle.Critical)
+        End Try
+
+    End Sub
+    Sub Open_folder()
+        Try
+            For Each row In GridViewFiles.GetSelectedRows
+                Dim SELECTED_DOC_PATH = _Helper.FORMAT_WM_PATH(GridViewFiles.GetRowCellValue(row, "FULL_FILENAME"))
+                Dim SELECTED_DOC_ID = GridViewFiles.GetRowCellValue(row, "DocID")
+                ClassHelper.Open_Folder(SELECTED_DOC_PATH, SELECTED_DOC_ID)
+
+                ClassHelper.File_open(SELECTED_DOC_PATH, SELECTED_DOC_ID)
+
+            Next
+
+
+        Catch ex As Exception
+            LOGGER.Error(ex)
+            MsgBox(ex.Message, MsgBoxStyle.Critical)
+        End Try
+
+
+
+    End Sub
+
+    Private Sub GridControlRecords_DoubleClick(sender As Object, e As EventArgs) Handles GridControlRecords.DoubleClick
+
+    End Sub
+
+    Private Sub DateiÖffnenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DateiÖffnenToolStripMenuItem.Click
+        File_open()
+    End Sub
+
+    Private Sub OrdnerÖffnenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles OrdnerÖffnenToolStripMenuItem.Click
+        Open_folder()
+    End Sub
+
+    Private Sub EigenschaftenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EigenschaftenToolStripMenuItem.Click
+        Show_File_Properties()
+    End Sub
+
+    Private Sub VerknüpfungenAnzeigenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VerknüpfungenAnzeigenToolStripMenuItem.Click
+        Try
+            ClassWindreamDocGrid.GetDocItems(GridViewFiles)
+            If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
+                MsgBox("Could not read File Parameters (LinkRecord)!", MsgBoxStyle.Exclamation)
+                Exit Sub
+            End If
+
+            Dim frm As New frmDoc_Links
+            frm.Show()
+            frm.BringToFront()
+        Catch ex As Exception
+            MsgBox("Unexpected Error in Showing DocLinks: " & ex.Message, MsgBoxStyle.Critical)
+        End Try
+    End Sub
+
+    Sub File_open()
+        Me.Cursor = Cursors.WaitCursor
+
+        For Each row In GridViewFiles.GetSelectedRows
+            Dim SELECTED_DOC_PATH = _Helper.FORMAT_WM_PATH(GridViewFiles.GetRowCellValue(row, "FULL_FILENAME"))
+            Dim SELECTED_DOC_ID = GridViewFiles.GetRowCellValue(row, "DocID")
+            If IsNothing(SELECTED_DOC_PATH) Then
+                MsgBox("Could not read File Parameters!", MsgBoxStyle.Exclamation)
+                Exit Sub
+            End If
+
+            ClassHelper.File_open(SELECTED_DOC_PATH, SELECTED_DOC_ID)
+
+        Next
+        Me.Cursor = Cursors.Default
+
+    End Sub
 End Class

app/DD-Record-Organizer/frmMain.Designer.vb

@@ -198,7 +198,7 @@ Partial Class frmMain
         Me.ribbonMain.ApplicationButtonDropDownControl = Me.MainMenu
         Me.ribbonMain.BackColor = System.Drawing.Color.DarkGray
         Me.ribbonMain.ExpandCollapseItem.Id = 0
-        Me.ribbonMain.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonMain.ExpandCollapseItem, Me.LabelMachine, Me.LabelLoggedIn, Me.LabelVersion, Me.itemInfo, Me.itemExit, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.itemSettings, Me.BarButtonItem2, Me.BarButtonItem10, Me.BarButtonItem12, Me.BarButtonItemConnections, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.LabelLanguage, Me.BarButtonItem20, Me.BarButtonItemSAPConnect, Me.BarButtonItemStructureNOdes, Me.BarSubItem1, Me.BarButtonItem14, Me.BarButtonItem21, Me.BarButtonItem22, Me.BarButtonItem8, Me.BarButtonItem9, Me.itemAbout, Me.BarButtonItem19, Me.btnGlobalSearch, Me.LabelUser, Me.bbtnItemViewsUser, Me.BarButtonItem23, Me.LabelProxyServer, Me.BarSubItem2, Me.BarButtonItem25, Me.StatusPersonifiedLogin, Me.itemScanInbox, Me.BarButtonItem13, Me.BarButtonItemSwitchCon, Me.LabelConString, Me.StatusVersionDB})
+        Me.ribbonMain.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonMain.ExpandCollapseItem, Me.ribbonMain.SearchEditItem, Me.LabelMachine, Me.LabelLoggedIn, Me.LabelVersion, Me.itemInfo, Me.itemExit, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.itemSettings, Me.BarButtonItem2, Me.BarButtonItem10, Me.BarButtonItem12, Me.BarButtonItemConnections, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.LabelLanguage, Me.BarButtonItem20, Me.BarButtonItemSAPConnect, Me.BarButtonItemStructureNOdes, Me.BarSubItem1, Me.BarButtonItem14, Me.BarButtonItem21, Me.BarButtonItem22, Me.BarButtonItem8, Me.BarButtonItem9, Me.itemAbout, Me.BarButtonItem19, Me.btnGlobalSearch, Me.LabelUser, Me.bbtnItemViewsUser, Me.BarButtonItem23, Me.LabelProxyServer, Me.BarSubItem2, Me.BarButtonItem25, Me.StatusPersonifiedLogin, Me.itemScanInbox, Me.BarButtonItem13, Me.BarButtonItemSwitchCon, Me.LabelConString, Me.StatusVersionDB})
         resources.ApplyResources(Me.ribbonMain, "ribbonMain")
         Me.ribbonMain.MaxItemId = 1
         Me.ribbonMain.Name = "ribbonMain"
@@ -222,146 +222,147 @@ Partial Class frmMain
         'itemSettings
         '
         resources.ApplyResources(Me.itemSettings, "itemSettings")
-        Me.itemSettings.Glyph = CType(resources.GetObject("itemSettings.Glyph"), System.Drawing.Image)
         Me.itemSettings.Id = 21
+        Me.itemSettings.ImageOptions.Image = CType(resources.GetObject("itemSettings.ImageOptions.Image"), System.Drawing.Image)
         Me.itemSettings.Name = "itemSettings"
         '
         'itemScanInbox
         '
         resources.ApplyResources(Me.itemScanInbox, "itemScanInbox")
-        Me.itemScanInbox.Glyph = CType(resources.GetObject("itemScanInbox.Glyph"), System.Drawing.Image)
         Me.itemScanInbox.Id = 6
+        Me.itemScanInbox.ImageOptions.Image = CType(resources.GetObject("itemScanInbox.ImageOptions.Image"), System.Drawing.Image)
         Me.itemScanInbox.Name = "itemScanInbox"
         Me.itemScanInbox.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
         '
         'BarButtonItem19
         '
         resources.ApplyResources(Me.BarButtonItem19, "BarButtonItem19")
-        Me.BarButtonItem19.Glyph = CType(resources.GetObject("BarButtonItem19.Glyph"), System.Drawing.Image)
         Me.BarButtonItem19.Id = 47
+        Me.BarButtonItem19.ImageOptions.Image = CType(resources.GetObject("BarButtonItem19.ImageOptions.Image"), System.Drawing.Image)
         Me.BarButtonItem19.Name = "BarButtonItem19"
         '
         'itemInfo
         '
         resources.ApplyResources(Me.itemInfo, "itemInfo")
-        Me.itemInfo.Glyph = CType(resources.GetObject("itemInfo.Glyph"), System.Drawing.Image)
         Me.itemInfo.Id = 9
+        Me.itemInfo.ImageOptions.Image = CType(resources.GetObject("itemInfo.ImageOptions.Image"), System.Drawing.Image)
         Me.itemInfo.Name = "itemInfo"
         '
         'itemAbout
         '
         resources.ApplyResources(Me.itemAbout, "itemAbout")
-        Me.itemAbout.Glyph = CType(resources.GetObject("itemAbout.Glyph"), System.Drawing.Image)
         Me.itemAbout.Id = 46
+        Me.itemAbout.ImageOptions.Image = CType(resources.GetObject("itemAbout.ImageOptions.Image"), System.Drawing.Image)
         Me.itemAbout.Name = "itemAbout"
         '
         'itemExit
         '
         resources.ApplyResources(Me.itemExit, "itemExit")
-        Me.itemExit.Glyph = CType(resources.GetObject("itemExit.Glyph"), System.Drawing.Image)
         Me.itemExit.Id = 10
+        Me.itemExit.ImageOptions.Image = CType(resources.GetObject("itemExit.ImageOptions.Image"), System.Drawing.Image)
         Me.itemExit.Name = "itemExit"
         '
         'LabelMachine
         '
         resources.ApplyResources(Me.LabelMachine, "LabelMachine")
-        Me.LabelMachine.Glyph = Global.DD_Record_Organizer.My.Resources.Resources.Monitor_Screen_16xLG
         Me.LabelMachine.Id = 3
+        Me.LabelMachine.ImageOptions.SvgImage = CType(resources.GetObject("LabelMachine.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.LabelMachine.Name = "LabelMachine"
-        Me.LabelMachine.TextAlignment = System.Drawing.StringAlignment.Near
+        Me.LabelMachine.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
         '
         'LabelLoggedIn
         '
         resources.ApplyResources(Me.LabelLoggedIn, "LabelLoggedIn")
-        Me.LabelLoggedIn.Glyph = Global.DD_Record_Organizer.My.Resources.Resources.UserInterfaceEditor_5845
         Me.LabelLoggedIn.Id = 5
+        Me.LabelLoggedIn.ImageOptions.SvgImage = CType(resources.GetObject("LabelLoggedIn.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.LabelLoggedIn.Name = "LabelLoggedIn"
-        Me.LabelLoggedIn.TextAlignment = System.Drawing.StringAlignment.Near
+        Me.LabelLoggedIn.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
         '
         'LabelVersion
         '
         resources.ApplyResources(Me.LabelVersion, "LabelVersion")
         Me.LabelVersion.Id = 6
         Me.LabelVersion.Name = "LabelVersion"
-        Me.LabelVersion.TextAlignment = System.Drawing.StringAlignment.Near
         '
         'BarButtonItem1
         '
         resources.ApplyResources(Me.BarButtonItem1, "BarButtonItem1")
-        Me.BarButtonItem1.Glyph = Global.DD_Record_Organizer.My.Resources.Resources.calendar_32x32
         Me.BarButtonItem1.Id = 11
+        Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.BarButtonItem1.Name = "BarButtonItem1"
         Me.BarButtonItem1.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large
         '
         'BarButtonItem3
         '
         resources.ApplyResources(Me.BarButtonItem3, "BarButtonItem3")
-        Me.BarButtonItem3.Glyph = CType(resources.GetObject("BarButtonItem3.Glyph"), System.Drawing.Image)
         Me.BarButtonItem3.Id = 13
+        Me.BarButtonItem3.ImageOptions.Image = CType(resources.GetObject("BarButtonItem3.ImageOptions.Image"), System.Drawing.Image)
         Me.BarButtonItem3.Name = "BarButtonItem3"
         Me.BarButtonItem3.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large
         '
         'BarButtonItem4
         '
         resources.ApplyResources(Me.BarButtonItem4, "BarButtonItem4")
-        Me.BarButtonItem4.Glyph = CType(resources.GetObject("BarButtonItem4.Glyph"), System.Drawing.Image)
         Me.BarButtonItem4.Id = 14
+        Me.BarButtonItem4.ImageOptions.Image = CType(resources.GetObject("BarButtonItem4.ImageOptions.Image"), System.Drawing.Image)
+        Me.BarButtonItem4.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem4.ImageOptions.LargeImage"), System.Drawing.Image)
         Me.BarButtonItem4.Name = "BarButtonItem4"
         Me.BarButtonItem4.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large
         '
         'BarButtonItem5
         '
         resources.ApplyResources(Me.BarButtonItem5, "BarButtonItem5")
-        Me.BarButtonItem5.Glyph = CType(resources.GetObject("BarButtonItem5.Glyph"), System.Drawing.Image)
         Me.BarButtonItem5.Id = 15
+        Me.BarButtonItem5.ImageOptions.Image = CType(resources.GetObject("BarButtonItem5.ImageOptions.Image"), System.Drawing.Image)
+        Me.BarButtonItem5.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem5.ImageOptions.LargeImage"), System.Drawing.Image)
         Me.BarButtonItem5.Name = "BarButtonItem5"
         Me.BarButtonItem5.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large
         '
         'BarButtonItem6
         '
         resources.ApplyResources(Me.BarButtonItem6, "BarButtonItem6")
-        Me.BarButtonItem6.Glyph = CType(resources.GetObject("BarButtonItem6.Glyph"), System.Drawing.Image)
         Me.BarButtonItem6.Id = 16
+        Me.BarButtonItem6.ImageOptions.Image = CType(resources.GetObject("BarButtonItem6.ImageOptions.Image"), System.Drawing.Image)
         Me.BarButtonItem6.Name = "BarButtonItem6"
         Me.BarButtonItem6.RibbonStyle = CType((DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large Or DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText), DevExpress.XtraBars.Ribbon.RibbonItemStyles)
         '
         'BarButtonItem7
         '
         resources.ApplyResources(Me.BarButtonItem7, "BarButtonItem7")
-        Me.BarButtonItem7.Glyph = CType(resources.GetObject("BarButtonItem7.Glyph"), System.Drawing.Image)
         Me.BarButtonItem7.Id = 17
+        Me.BarButtonItem7.ImageOptions.Image = CType(resources.GetObject("BarButtonItem7.ImageOptions.Image"), System.Drawing.Image)
         Me.BarButtonItem7.Name = "BarButtonItem7"
         Me.BarButtonItem7.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large
         '
         'BarButtonItem2
         '
         resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2")
-        Me.BarButtonItem2.Glyph = Global.DD_Record_Organizer.My.Resources.Resources.Einstellungen5
         Me.BarButtonItem2.Id = 22
+        Me.BarButtonItem2.ImageOptions.Image = Global.DD_Record_Organizer.My.Resources.Resources.Einstellungen5
         Me.BarButtonItem2.Name = "BarButtonItem2"
         Me.BarButtonItem2.RibbonStyle = CType((DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large Or DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText), DevExpress.XtraBars.Ribbon.RibbonItemStyles)
         '
         'BarButtonItem10
         '
         resources.ApplyResources(Me.BarButtonItem10, "BarButtonItem10")
-        Me.BarButtonItem10.Glyph = Global.DD_Record_Organizer.My.Resources.Resources.Einstellungen3
         Me.BarButtonItem10.Id = 23
+        Me.BarButtonItem10.ImageOptions.Image = Global.DD_Record_Organizer.My.Resources.Resources.Einstellungen3
         Me.BarButtonItem10.Name = "BarButtonItem10"
         Me.BarButtonItem10.RibbonStyle = CType((DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large Or DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText), DevExpress.XtraBars.Ribbon.RibbonItemStyles)
         '
         'BarButtonItem12
         '
         resources.ApplyResources(Me.BarButtonItem12, "BarButtonItem12")
-        Me.BarButtonItem12.Glyph = CType(resources.GetObject("BarButtonItem12.Glyph"), System.Drawing.Image)
         Me.BarButtonItem12.Id = 24
+        Me.BarButtonItem12.ImageOptions.Image = CType(resources.GetObject("BarButtonItem12.ImageOptions.Image"), System.Drawing.Image)
         Me.BarButtonItem12.Name = "BarButtonItem12"
         Me.BarButtonItem12.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large
         '
         'BarButtonItemConnections
         '
         resources.ApplyResources(Me.BarButtonItemConnections, "BarButtonItemConnections")
-        Me.BarButtonItemConnections.Glyph = CType(resources.GetObject("BarButtonItemConnections.Glyph"), System.Drawing.Image)
         Me.BarButtonItemConnections.Id = 26
+        Me.BarButtonItemConnections.ImageOptions.Image = CType(resources.GetObject("BarButtonItemConnections.ImageOptions.Image"), System.Drawing.Image)
         Me.BarButtonItemConnections.Name = "BarButtonItemConnections"
         Me.BarButtonItemConnections.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large
         '
@@ -375,24 +376,26 @@ Partial Class frmMain
         'BarButtonItem16
         '
         resources.ApplyResources(Me.BarButtonItem16, "BarButtonItem16")
-        Me.BarButtonItem16.Glyph = CType(resources.GetObject("BarButtonItem16.Glyph"), System.Drawing.Image)
         Me.BarButtonItem16.Id = 28
+        Me.BarButtonItem16.ImageOptions.Image = CType(resources.GetObject("BarButtonItem16.ImageOptions.Image"), System.Drawing.Image)
+        Me.BarButtonItem16.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem16.ImageOptions.LargeImage"), System.Drawing.Image)
         Me.BarButtonItem16.Name = "BarButtonItem16"
         Me.BarButtonItem16.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large
         '
         'BarButtonItem17
         '
         resources.ApplyResources(Me.BarButtonItem17, "BarButtonItem17")
-        Me.BarButtonItem17.Glyph = CType(resources.GetObject("BarButtonItem17.Glyph"), System.Drawing.Image)
         Me.BarButtonItem17.Id = 29
+        Me.BarButtonItem17.ImageOptions.Image = CType(resources.GetObject("BarButtonItem17.ImageOptions.Image"), System.Drawing.Image)
         Me.BarButtonItem17.Name = "BarButtonItem17"
         Me.BarButtonItem17.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large
         '
         'BarButtonItem18
         '
         resources.ApplyResources(Me.BarButtonItem18, "BarButtonItem18")
-        Me.BarButtonItem18.Glyph = CType(resources.GetObject("BarButtonItem18.Glyph"), System.Drawing.Image)
         Me.BarButtonItem18.Id = 31
+        Me.BarButtonItem18.ImageOptions.Image = CType(resources.GetObject("BarButtonItem18.ImageOptions.Image"), System.Drawing.Image)
+        Me.BarButtonItem18.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem18.ImageOptions.LargeImage"), System.Drawing.Image)
         Me.BarButtonItem18.Name = "BarButtonItem18"
         Me.BarButtonItem18.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large
         '
@@ -401,13 +404,13 @@ Partial Class frmMain
         resources.ApplyResources(Me.LabelLanguage, "LabelLanguage")
         Me.LabelLanguage.Id = 33
         Me.LabelLanguage.Name = "LabelLanguage"
-        Me.LabelLanguage.TextAlignment = System.Drawing.StringAlignment.Near
         '
         'BarButtonItem20
         '
         resources.ApplyResources(Me.BarButtonItem20, "BarButtonItem20")
-        Me.BarButtonItem20.Glyph = CType(resources.GetObject("BarButtonItem20.Glyph"), System.Drawing.Image)
         Me.BarButtonItem20.Id = 34
+        Me.BarButtonItem20.ImageOptions.Image = CType(resources.GetObject("BarButtonItem20.ImageOptions.Image"), System.Drawing.Image)
+        Me.BarButtonItem20.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem20.ImageOptions.LargeImage"), System.Drawing.Image)
         Me.BarButtonItem20.Name = "BarButtonItem20"
         Me.BarButtonItem20.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large
         '
@@ -415,16 +418,16 @@ Partial Class frmMain
         '
         resources.ApplyResources(Me.BarButtonItemSAPConnect, "BarButtonItemSAPConnect")
         Me.BarButtonItemSAPConnect.Enabled = False
-        Me.BarButtonItemSAPConnect.Glyph = Global.DD_Record_Organizer.My.Resources.Resources.Connection_Manager
         Me.BarButtonItemSAPConnect.Id = 36
+        Me.BarButtonItemSAPConnect.ImageOptions.Image = Global.DD_Record_Organizer.My.Resources.Resources.Connection_Manager
         Me.BarButtonItemSAPConnect.Name = "BarButtonItemSAPConnect"
         Me.BarButtonItemSAPConnect.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large
         '
         'BarButtonItemStructureNOdes
         '
         resources.ApplyResources(Me.BarButtonItemStructureNOdes, "BarButtonItemStructureNOdes")
-        Me.BarButtonItemStructureNOdes.Glyph = CType(resources.GetObject("BarButtonItemStructureNOdes.Glyph"), System.Drawing.Image)
         Me.BarButtonItemStructureNOdes.Id = 37
+        Me.BarButtonItemStructureNOdes.ImageOptions.Image = CType(resources.GetObject("BarButtonItemStructureNOdes.ImageOptions.Image"), System.Drawing.Image)
         Me.BarButtonItemStructureNOdes.Name = "BarButtonItemStructureNOdes"
         Me.BarButtonItemStructureNOdes.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large
         '
@@ -439,81 +442,80 @@ Partial Class frmMain
         'BarButtonItem14
         '
         resources.ApplyResources(Me.BarButtonItem14, "BarButtonItem14")
-        Me.BarButtonItem14.Glyph = CType(resources.GetObject("BarButtonItem14.Glyph"), System.Drawing.Image)
         Me.BarButtonItem14.Id = 39
+        Me.BarButtonItem14.ImageOptions.Image = CType(resources.GetObject("BarButtonItem14.ImageOptions.Image"), System.Drawing.Image)
         Me.BarButtonItem14.Name = "BarButtonItem14"
         '
         'BarButtonItem21
         '
         resources.ApplyResources(Me.BarButtonItem21, "BarButtonItem21")
-        Me.BarButtonItem21.Glyph = CType(resources.GetObject("BarButtonItem21.Glyph"), System.Drawing.Image)
         Me.BarButtonItem21.Id = 40
+        Me.BarButtonItem21.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem21.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.BarButtonItem21.Name = "BarButtonItem21"
         '
         'BarButtonItem22
         '
         resources.ApplyResources(Me.BarButtonItem22, "BarButtonItem22")
-        Me.BarButtonItem22.Glyph = CType(resources.GetObject("BarButtonItem22.Glyph"), System.Drawing.Image)
         Me.BarButtonItem22.Id = 41
+        Me.BarButtonItem22.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem22.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.BarButtonItem22.Name = "BarButtonItem22"
         '
         'BarButtonItem8
         '
         resources.ApplyResources(Me.BarButtonItem8, "BarButtonItem8")
-        Me.BarButtonItem8.Glyph = CType(resources.GetObject("BarButtonItem8.Glyph"), System.Drawing.Image)
         Me.BarButtonItem8.Id = 44
+        Me.BarButtonItem8.ImageOptions.Image = CType(resources.GetObject("BarButtonItem8.ImageOptions.Image"), System.Drawing.Image)
         Me.BarButtonItem8.Name = "BarButtonItem8"
         '
         'BarButtonItem9
         '
         resources.ApplyResources(Me.BarButtonItem9, "BarButtonItem9")
-        Me.BarButtonItem9.Glyph = CType(resources.GetObject("BarButtonItem9.Glyph"), System.Drawing.Image)
         Me.BarButtonItem9.Id = 45
+        Me.BarButtonItem9.ImageOptions.Image = CType(resources.GetObject("BarButtonItem9.ImageOptions.Image"), System.Drawing.Image)
         Me.BarButtonItem9.Name = "BarButtonItem9"
         '
         'BarButtonItem23
         '
         resources.ApplyResources(Me.BarButtonItem23, "BarButtonItem23")
-        Me.BarButtonItem23.Glyph = CType(resources.GetObject("BarButtonItem23.Glyph"), System.Drawing.Image)
         Me.BarButtonItem23.Id = 9
-        Me.BarButtonItem23.LargeGlyph = CType(resources.GetObject("BarButtonItem23.LargeGlyph"), System.Drawing.Image)
+        Me.BarButtonItem23.ImageOptions.Image = CType(resources.GetObject("BarButtonItem23.ImageOptions.Image"), System.Drawing.Image)
+        Me.BarButtonItem23.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem23.ImageOptions.LargeImage"), System.Drawing.Image)
         Me.BarButtonItem23.Name = "BarButtonItem23"
         '
         'btnGlobalSearch
         '
         resources.ApplyResources(Me.btnGlobalSearch, "btnGlobalSearch")
         Me.btnGlobalSearch.Enabled = False
-        Me.btnGlobalSearch.Glyph = CType(resources.GetObject("btnGlobalSearch.Glyph"), System.Drawing.Image)
         Me.btnGlobalSearch.Id = 2
-        Me.btnGlobalSearch.LargeGlyph = CType(resources.GetObject("btnGlobalSearch.LargeGlyph"), System.Drawing.Image)
+        Me.btnGlobalSearch.ImageOptions.SvgImage = CType(resources.GetObject("btnGlobalSearch.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.btnGlobalSearch.Name = "btnGlobalSearch"
         '
         'LabelUser
         '
         resources.ApplyResources(Me.LabelUser, "LabelUser")
-        Me.LabelUser.Glyph = Global.DD_Record_Organizer.My.Resources.Resources.user_16xLG
         Me.LabelUser.Id = 4
+        Me.LabelUser.ImageOptions.SvgImage = CType(resources.GetObject("LabelUser.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.LabelUser.Name = "LabelUser"
         '
         'bbtnItemViewsUser
         '
         resources.ApplyResources(Me.bbtnItemViewsUser, "bbtnItemViewsUser")
-        Me.bbtnItemViewsUser.Glyph = CType(resources.GetObject("bbtnItemViewsUser.Glyph"), System.Drawing.Image)
         Me.bbtnItemViewsUser.Id = 7
+        Me.bbtnItemViewsUser.ImageOptions.Image = CType(resources.GetObject("bbtnItemViewsUser.ImageOptions.Image"), System.Drawing.Image)
         Me.bbtnItemViewsUser.Name = "bbtnItemViewsUser"
         Me.bbtnItemViewsUser.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large
         '
         'LabelProxyServer
         '
         resources.ApplyResources(Me.LabelProxyServer, "LabelProxyServer")
-        Me.LabelProxyServer.Glyph = CType(resources.GetObject("LabelProxyServer.Glyph"), System.Drawing.Image)
         Me.LabelProxyServer.Id = 1
+        Me.LabelProxyServer.ImageOptions.SvgImage = CType(resources.GetObject("LabelProxyServer.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.LabelProxyServer.ItemAppearance.Normal.Font = CType(resources.GetObject("LabelProxyServer.ItemAppearance.Normal.Font"), System.Drawing.Font)
-        Me.LabelProxyServer.ItemAppearance.Normal.ForeColor = CType(resources.GetObject("LabelProxyServer.ItemAppearance.Normal.ForeColor"), System.Drawing.Color)
+        Me.LabelProxyServer.ItemAppearance.Normal.ForeColor = System.Drawing.Color.Yellow
         Me.LabelProxyServer.ItemAppearance.Normal.Options.UseFont = True
         Me.LabelProxyServer.ItemAppearance.Normal.Options.UseForeColor = True
         Me.LabelProxyServer.Name = "LabelProxyServer"
-        Me.LabelProxyServer.TextAlignment = System.Drawing.StringAlignment.Near
+        Me.LabelProxyServer.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
         Me.LabelProxyServer.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
         '
         'BarSubItem2
@@ -531,58 +533,58 @@ Partial Class frmMain
         '
         'StatusPersonifiedLogin
         '
-        Me.StatusPersonifiedLogin.Glyph = Global.DD_Record_Organizer.My.Resources.Resources.user_16xLG
         Me.StatusPersonifiedLogin.Id = 5
+        Me.StatusPersonifiedLogin.ImageOptions.SvgImage = CType(resources.GetObject("StatusPersonifiedLogin.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.StatusPersonifiedLogin.ItemAppearance.Normal.Font = CType(resources.GetObject("StatusPersonifiedLogin.ItemAppearance.Normal.Font"), System.Drawing.Font)
-        Me.StatusPersonifiedLogin.ItemAppearance.Normal.ForeColor = CType(resources.GetObject("StatusPersonifiedLogin.ItemAppearance.Normal.ForeColor"), System.Drawing.Color)
+        Me.StatusPersonifiedLogin.ItemAppearance.Normal.ForeColor = System.Drawing.Color.Yellow
         Me.StatusPersonifiedLogin.ItemAppearance.Normal.Options.UseFont = True
         Me.StatusPersonifiedLogin.ItemAppearance.Normal.Options.UseForeColor = True
         Me.StatusPersonifiedLogin.Name = "StatusPersonifiedLogin"
-        Me.StatusPersonifiedLogin.TextAlignment = System.Drawing.StringAlignment.Near
+        Me.StatusPersonifiedLogin.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
         '
         'BarButtonItem13
         '
         resources.ApplyResources(Me.BarButtonItem13, "BarButtonItem13")
-        Me.BarButtonItem13.Glyph = CType(resources.GetObject("BarButtonItem13.Glyph"), System.Drawing.Image)
         Me.BarButtonItem13.Id = 7
+        Me.BarButtonItem13.ImageOptions.Image = CType(resources.GetObject("BarButtonItem13.ImageOptions.Image"), System.Drawing.Image)
+        Me.BarButtonItem13.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem13.ImageOptions.LargeImage"), System.Drawing.Image)
         Me.BarButtonItem13.Name = "BarButtonItem13"
+        Me.BarButtonItem13.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText
         '
         'BarButtonItemSwitchCon
         '
         resources.ApplyResources(Me.BarButtonItemSwitchCon, "BarButtonItemSwitchCon")
-        Me.BarButtonItemSwitchCon.Glyph = CType(resources.GetObject("BarButtonItemSwitchCon.Glyph"), System.Drawing.Image)
         Me.BarButtonItemSwitchCon.Id = 8
-        Me.BarButtonItemSwitchCon.LargeGlyph = CType(resources.GetObject("BarButtonItemSwitchCon.LargeGlyph"), System.Drawing.Image)
+        Me.BarButtonItemSwitchCon.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItemSwitchCon.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.BarButtonItemSwitchCon.Name = "BarButtonItemSwitchCon"
         '
         'LabelConString
         '
         resources.ApplyResources(Me.LabelConString, "LabelConString")
-        Me.LabelConString.Glyph = CType(resources.GetObject("LabelConString.Glyph"), System.Drawing.Image)
         Me.LabelConString.Id = 10
+        Me.LabelConString.ImageOptions.SvgImage = CType(resources.GetObject("LabelConString.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.LabelConString.Name = "LabelConString"
-        Me.LabelConString.TextAlignment = System.Drawing.StringAlignment.Near
+        Me.LabelConString.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
         '
         'StatusVersionDB
         '
         resources.ApplyResources(Me.StatusVersionDB, "StatusVersionDB")
         Me.StatusVersionDB.Id = 11
         Me.StatusVersionDB.Name = "StatusVersionDB"
-        Me.StatusVersionDB.TextAlignment = System.Drawing.StringAlignment.Near
         '
         'pageHome
         '
         Me.pageHome.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.groupQuickAccessForm, Me.groupSearchAllOver, Me.RibbonPageGroupConnManager})
-        Me.pageHome.Image = Global.DD_Record_Organizer.My.Resources.Resources.HomeHS
+        Me.pageHome.ImageOptions.Image = Global.DD_Record_Organizer.My.Resources.Resources.HomeHS
         Me.pageHome.Name = "pageHome"
         resources.ApplyResources(Me.pageHome, "pageHome")
         '
         'RibbonPageGroup2
         '
         Me.RibbonPageGroup2.AllowTextClipping = False
+        Me.RibbonPageGroup2.CaptionButtonVisible = DevExpress.Utils.DefaultBoolean.[False]
         Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem1, True)
         Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
-        Me.RibbonPageGroup2.ShowCaptionButton = False
         resources.ApplyResources(Me.RibbonPageGroup2, "RibbonPageGroup2")
         '
         'groupQuickAccessForm
@@ -594,10 +596,10 @@ Partial Class frmMain
         '
         'groupSearchAllOver
         '
-        Me.groupSearchAllOver.AllowMinimize = False
         Me.groupSearchAllOver.AllowTextClipping = False
         Me.groupSearchAllOver.ItemLinks.Add(Me.btnGlobalSearch)
         Me.groupSearchAllOver.Name = "groupSearchAllOver"
+        Me.groupSearchAllOver.State = DevExpress.XtraBars.Ribbon.RibbonPageGroupState.Expanded
         resources.ApplyResources(Me.groupSearchAllOver, "groupSearchAllOver")
         '
         'RibbonPageGroupConnManager
@@ -610,12 +612,13 @@ Partial Class frmMain
         '
         'pageForms
         '
-        Me.pageForms.Appearance.BackColor = CType(resources.GetObject("pageForms.Appearance.BackColor"), System.Drawing.Color)
+        Me.pageForms.Appearance.BackColor = System.Drawing.Color.Yellow
         Me.pageForms.Appearance.Options.UseBackColor = True
         Me.pageForms.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.groupQuickAccessForm2})
-        Me.pageForms.Image = Global.DD_Record_Organizer.My.Resources.Resources.application_form
+        Me.pageForms.ImageOptions.Image = Global.DD_Record_Organizer.My.Resources.Resources.application_form
         Me.pageForms.Name = "pageForms"
         resources.ApplyResources(Me.pageForms, "pageForms")
+        Me.pageForms.Visible = False
         '
         'groupQuickAccessForm2
         '
@@ -625,7 +628,7 @@ Partial Class frmMain
         'pageAdmin
         '
         Me.pageAdmin.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroupProgram, Me.RibbonPageGroupTask, Me.RibbonPageGroupMenue, Me.RibbonPageGroup1})
-        Me.pageAdmin.Image = Global.DD_Record_Organizer.My.Resources.Resources.Property_501
+        Me.pageAdmin.ImageOptions.Image = Global.DD_Record_Organizer.My.Resources.Resources.Property_501
         Me.pageAdmin.Name = "pageAdmin"
         resources.ApplyResources(Me.pageAdmin, "pageAdmin")
         Me.pageAdmin.Visible = False
@@ -693,8 +696,8 @@ Partial Class frmMain
         'BarButtonItem11
         '
         resources.ApplyResources(Me.BarButtonItem11, "BarButtonItem11")
-        Me.BarButtonItem11.Glyph = Global.DD_Record_Organizer.My.Resources.Resources._005_Task_32x42_72
         Me.BarButtonItem11.Id = 14
+        Me.BarButtonItem11.ImageOptions.Image = Global.DD_Record_Organizer.My.Resources.Resources._005_Task_32x42_72
         Me.BarButtonItem11.Name = "BarButtonItem11"
         Me.BarButtonItem11.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large
         '
@@ -712,7 +715,6 @@ Partial Class frmMain
         resources.ApplyResources(Me.BarStaticItem1, "BarStaticItem1")
         Me.BarStaticItem1.Id = 6
         Me.BarStaticItem1.Name = "BarStaticItem1"
-        Me.BarStaticItem1.TextAlignment = System.Drawing.StringAlignment.Near
         '
         'TimerInformation
         '
@@ -731,13 +733,14 @@ Partial Class frmMain
         '
         'frmMain
         '
-        Me.Appearance.BackColor = CType(resources.GetObject("frmMain.Appearance.BackColor"), System.Drawing.Color)
+        Me.Appearance.BackColor = System.Drawing.Color.White
         Me.Appearance.Options.UseBackColor = True
         Me.Appearance.Options.UseFont = True
         resources.ApplyResources(Me, "$this")
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.Controls.Add(Me.RibbonStatusBar1)
         Me.Controls.Add(Me.ribbonMain)
+        Me.IconOptions.Icon = CType(resources.GetObject("frmMain.IconOptions.Icon"), System.Drawing.Icon)
         Me.IsMdiContainer = True
         Me.KeyPreview = True
         Me.Name = "frmMain"

app/DD-Record-Organizer/frmMain.vb

@@ -96,7 +96,7 @@ Public Class frmMain
                 Dim IPs As IPAddress
                 For Each IPs In Addresslist
                     'Aktuelle Machine
-                    ClassLogger.Add(">> " & My.Computer.Name & " - IP: " & IPs.ToString, False)
+                    LOGGER.Info("" & My.Computer.Name & " - IP: " & IPs.ToString, False)
                     LabelMachine.Caption = My.Computer.Name & " - IP: " & IPs.ToString
                 Next IPs
 
@@ -120,7 +120,7 @@ Public Class frmMain
             Catch ex As Exception
                 MsgBox("Error in Load Form:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
             End Try
-            If LogErrorsOnly = False Then ClassLogger.Add(">> FormLoad finished!", False)
+            LOGGER.Debug("FormLoad finished!", False)
             Proxy_Server_Controls()
             CONN_Manager
 
@@ -148,7 +148,7 @@ Public Class frmMain
                 End If
             End If
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in CONN_Manager:" & ex.Message, True)
+            LOGGER.Warn("Unexpected Error in CONN_Manager:" & ex.Message)
         End Try
     End Sub
     Sub Proxy_Server_Controls()
@@ -156,13 +156,13 @@ Public Class frmMain
             If LICENSE_PROXY = True And clsDatabase.DB_PROXY_INITIALIZED = True Then
                 'itemRefreshProxy.Visibility = BarItemVisibility.Always
                 LabelProxyServer.Visibility = BarItemVisibility.Always
-                ClassLogger.Add(">> PROXY-SERVER is being used", False)
+                LOGGER.Info("PROXY-SERVER is being used", False)
             Else
                 'itemRefreshProxy.Visibility = BarItemVisibility.Never
                 LabelProxyServer.Visibility = BarItemVisibility.Never
             End If
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in Sub Proxy_Server_Controls():" & ex.Message, True)
+            LOGGER.Warn("Unexpected Error in Sub Proxy_Server_Controls():" & ex.Message)
         End Try
 
     End Sub
@@ -170,7 +170,7 @@ Public Class frmMain
         Try
             If TIMER_SCAN.Enabled = False And CURRENT_SCAN_FOLDERWATCH <> "" And FWSCAN_started = True Then
                 If System.IO.Directory.Exists(CURRENT_SCAN_FOLDERWATCH) = False Then
-                    ClassLogger.Add(">> SCAN PATH '" & CURRENT_SCAN_FOLDERWATCH & "'not accessable!", False)
+                    LOGGER.Warn("SCAN PATH '" & CURRENT_SCAN_FOLDERWATCH & "'not accessable!", False)
                     Exit Sub
                 End If
                 TIMER_SCAN.Interval = 30000
@@ -310,7 +310,7 @@ Public Class frmMain
             Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL2)
 
             If dt.Rows.Count <> 0 Then
-
+                pageForms.Visible = True
                 For Each row As DataRow In dt.Rows
                     Dim image As Bitmap = Nothing
 
@@ -347,6 +347,8 @@ Public Class frmMain
                     groupQuickAccessForm2.ItemLinks.Add(item)
 
                 Next
+            Else
+                pageForms.Visible = False
 
             End If
         Catch ex As Exception
@@ -490,7 +492,7 @@ Public Class frmMain
 
             End If
         Catch ex As Exception
-            ClassLogger.Add("Unexpected Error in Load BackgroundImage: " & ex.Message)
+            LOGGER.Warn("Unexpected Error in Load BackgroundImage: " & ex.Message)
         End Try
 
     End Sub
@@ -572,7 +574,7 @@ Public Class frmMain
                 'Lizenz abgellaufen, überprüfen ob User Admin ist
                 If LICENSE_COUNT < USERS_LOGGED_IN Then
                     If USER_IS_ADMIN = True Then
-                        ClassLogger.Add(">> User is Admin - Timer will be started", False)
+                        LOGGER.Info("User is Admin - Timer will be started", False)
                         'If USER_LANGUAGE = "de-DE" Then
                         MsgBox("You now got 3 minutes for creating a new license", MsgBoxStyle.Information)
                         'Else
@@ -615,7 +617,7 @@ Public Class frmMain
                                         Dim result As MsgBoxResult
                                         result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
                                         If result = MsgBoxResult.Yes Then
-                                            Process.Start(ClassLogger.DateiSpeicherort)
+                                            Process.Start(LOGCONFIG.LogFile)
                                         End If
                                     Else
                                         If ClassUpdate.UPDATE_NECESSARY Then
@@ -666,7 +668,7 @@ Public Class frmMain
 
         'If DOCTYPE_COUNT_ACTUAL > LICENSE_DOCTYPE_COUNT Then
         '    If CURRENT_USER_IS_ADMIN = True Then
-        '        ClassLogger.Add(">> User is Admin - Timer will be started", False)
+        '        Logger.Info("User is Admin - Timer will be started", False)
         '        If USER_LANGUAGE = "de-DE" Then
         '            MsgBox("Sie haben nun 3 Minuten Zeit eine neue Lizenz zu vergeben!", MsgBoxStyle.Information)
         '        Else
@@ -1072,7 +1074,7 @@ Public Class frmMain
                         My.Computer.Registry.SetValue("HKEY_CURRENT_USER\Software\A.I.S. GmbH\windream\3.6\ServerShareSelector", "CurrentAlias", oWM_ALIAS)
                         My.Computer.Registry.SetValue("HKEY_CURRENT_USER\Software\A.I.S. GmbH\windream\3.6\ServerShareSelector", "VFSAlias", oWM_ALIAS)
                     Catch ex As Exception
-                        ClassLogger.Add("Unexpected error in Changing WMAlias: " & ex.Message, True)
+                        LOGGER.Warn("Unexpected error in Changing WMAlias: " & ex.Message)
                         MsgBox("Unexpected error in Changing WMAlias: " & ex.Message, MsgBoxStyle.Critical)
                         Exit Sub
                     End Try
@@ -1081,7 +1083,7 @@ Public Class frmMain
                         IndexService.shutdown
                         IndexService.Start
                     Catch ex As Exception
-                        ClassLogger.Add("Unexpected error in Restarting IndexService: " & ex.Message, True)
+                        LOGGER.Warn("Unexpected error in Restarting IndexService: " & ex.Message)
                         MsgBox("Unexpected error in Restarting IndexService: " & ex.Message, MsgBoxStyle.Critical)
                         Exit Sub
                     End Try
@@ -1090,7 +1092,7 @@ Public Class frmMain
                         ControlCenter.StartVFSService(0)
                         ControlCenter.StartVFSService(1)
                     Catch ex As Exception
-                        ClassLogger.Add("Unexpected error in Restarting ControlCenter: " & ex.Message, True)
+                        LOGGER.Warn("Unexpected error in Restarting ControlCenter: " & ex.Message)
                         MsgBox("Unexpected error in Restarting ControlCenter: " & ex.Message, MsgBoxStyle.Critical)
                         Exit Sub
                     End Try

app/DD-Record-Organizer/frmMass_Change.vb

@@ -42,7 +42,7 @@ Public Class frmMass_Change
                 result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
                 If result = MsgBoxResult.Yes Then
                     Cursor = Cursors.WaitCursor
-                    ClassLogger.Add(String.Format("### Starting MassChange of column '{0}' with value '{1}'....###", cmbColumn.Text, txtNewValue.Text), False)
+                    LOGGER.Info(String.Format("### Starting MassChange of column '{0}' with value '{1}'....###", cmbColumn.Text, txtNewValue.Text))
                     ClassHelper.InsertEssential_Log(USER_GUID, "User-ID", String.Format("### Starting MassChange of column '{0}' with value '{1}'....###", cmbColumn.Text, txtNewValue.Text))
                     Me.Cursor = Cursors.WaitCursor
                     SQL = String.Format("SELECT GUID FROM TBPMO_CONTROL WHERE COL_NAME = '{0}' AND FORM_ID = {1}", cmbColumn.Text, CURRENT_ENTITY_ID)
@@ -116,17 +116,17 @@ Public Class frmMass_Change
                                 SQL = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}',CHANGED_WHO = '{1}' WHERE GUID = {2}", val, USER_USERNAME, ex_GUID)
                                 If ClassDatabase.Execute_non_Query(SQL, False) = False Then
                                     _Error = True
-                                    ClassLogger.Add(">> Error in updating the value for Record: " & Record, False)
+                                LOGGER.Warn("Error in updating the value for Record: " & Record)
 
-                                Else
+                            Else
                                 ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(CURRENT_ENTITY_ID, _CONTROLID, CInt(Record), val)
                             End If
                             Else
                             SQL = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID, RECORD_ID, VALUE, ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", _CONTROLID, CInt(Record), val, USER_USERNAME)
                             If ClassDatabase.Execute_non_Query(SQL, False) = False Then
                                     _Error = True
-                                    ClassLogger.Add(">> Error in inserting the value for Record: " & Record, False)
+                                LOGGER.Warn("Error in inserting the value for Record: " & Record)
-                                Else
+                            Else
                                 ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(CURRENT_ENTITY_ID, _CONTROLID, CInt(Record), val)
                             End If
                             End If
@@ -135,13 +135,13 @@ Public Class frmMass_Change
                         i += 1
                     Next
                     SUCCESSFULL = True
-                    ClassLogger.Add(String.Format("### MassChange finished successfully! ###"), False)
+                LOGGER.Info(String.Format("### MassChange finished successfully! ###"))
-                Catch ex As Exception
+            Catch ex As Exception
-                    ClassLogger.Add("Unexpected Error in Getting record to be changed:" & ex.Message)
+                LOGGER.Warn("Unexpected Error in Getting record to be changed:" & ex.Message)
-                    _Error = True
+                _Error = True
                 End Try
             Else
-            ClassLogger.Add("No defined Control found!")
+            LOGGER.Warn("No defined Control found!")
             _Error = True
         End If
 
@@ -162,7 +162,7 @@ Public Class frmMass_Change
             msg = "All changes were executed!"
         End If
         If _Error = True Then
-            ClassLogger.Add(String.Format("### MassChange finished - WITH errors!! ###"))
+            LOGGER.Warn(String.Format("### MassChange finished - WITH errors!! ###"))
             If USER_LANGUAGE <> "de-DE" Then
                 msg = msg & vbNewLine & "But errors occured while updating values! Check the log"
             Else

app/DD-Record-Organizer/frmRecordView.vb

@@ -395,9 +395,9 @@ Public Class frmRecordView
             Dim State_DESC = ClassDatabase.Execute_Scalar(sql, True)
             Dim Comment
             If COMMENTTextBox.Text <> "" Then
-                Comment = String.Format(COMMENTTextBox.Text & vbNewLine & ">> " & Now.ToString & ": User {0} changed the state to: {1}", Environment.UserName, State_DESC)
+                Comment = String.Format(COMMENTTextBox.Text & vbNewLine & "" & Now.ToString & ": User {0} changed the state to: {1}", Environment.UserName, State_DESC)
             Else
-                Comment = String.Format(">> " & Now.ToString & ": User {0} Changed the state to: {1}", Environment.UserName, State_DESC)
+                Comment = String.Format("" & Now.ToString & ": User {0} Changed the state to: {1}", Environment.UserName, State_DESC)
             End If
             If STATE_id > 0 Then
                 ins = String.Format("INSERT INTO TBPMO_WORKFLOW_TASK_HISTORY (WF_TASK_ID,STATE_ID,STATE_DESC,COMMENT,ADDED_WHO) VALUES" &
@@ -587,7 +587,7 @@ Public Class frmRecordView
                 If Not IsNothing(Str) Then
                     Dim DropType = Str.Substring(0, Str.LastIndexOf("@") + 1)
                     If DropType.ToString.Contains("SCAN") = False Then
-                        ClassLogger.Add(">> Check_Dropped_Files:" & Str.ToString, False)
+                        LOGGER.Info("Check_Dropped_Files:" & Str.ToString)
                         Dim CURRENT_WORKFILE = Str.Substring(Str.LastIndexOf("@") + 1)
                         Dim insert = String.Format("INSERT INTO TBPMO_FILES_USER(FILENAME2WORK, USER_WORK, HANDLE_TYPE) VALUES('{0}','{1}','{2}')", CURRENT_WORKFILE, USER_USERNAME, DropType)
                         If ClassDatabase.Execute_non_Query(insert, True) = False Then
@@ -613,7 +613,7 @@ Public Class frmRecordView
                             If CURRENT_TBPMO_FILES_USER.Rows.Count = 1 Then
                                 frmWM_IndexFile.ShowDialog()
                             Else
-                                If LogErrorsOnly = False Then ClassLogger.Add(" >> File was deleted or worked meanwhile!")
+                                LOGGER.Debug("File was deleted or worked meanwhile!")
                             End If
                         Next
                         RUN_WDSEARCH_GRID()

app/DD-Record-Organizer/frmSAP_FuBa.Designer.vb

@@ -797,7 +797,7 @@ Partial Class frmSAP_FuBa
         '
         'btnERPConnect
         '
-        Me.btnERPConnect.Font = New System.Drawing.Font("Segoe UI Semibold", 9.75!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle))
+        Me.btnERPConnect.Font = New System.Drawing.Font("Segoe UI Semibold", 9.75!, System.Drawing.FontStyle.Bold)
         Me.btnERPConnect.Image = Global.DD_Record_Organizer.My.Resources.Resources.database_connect
         Me.btnERPConnect.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.btnERPConnect.ImeMode = System.Windows.Forms.ImeMode.NoControl

app/DD-Record-Organizer/frmSAP_FuBa.vb

@@ -63,8 +63,8 @@ Public Class frmSAP_FuBa
         Me.Cursor = Cursors.Default
         'Try
         '    Me.Cursor = Cursors.WaitCursor
-        '    If LogErrorsOnly = False Then ClassLogger.Add("", False)
+        '    LOGGER.Debug("")
-        '    If LogErrorsOnly = False Then ClassLogger.Add(" >> SAP Connect started:", False)
+        '    LOGGER.Debug("SAP Connect started:")
         '    ERPConnect.LIC.SetLic("W86DWC992C")
         '    con.Host = HostTextBox.Text
         '    con.SystemNumber = SystemNumberTextBox.Text
@@ -72,10 +72,10 @@ Public Class frmSAP_FuBa
         '    con.Password = PasswordTextBox.Text
         '    con.Client = ClientTextBox.Text
         '    con.Language = LanguageTextBox.Text
-        '    If LogErrorsOnly = False Then ClassLogger.Add(" >> HOST: " & HostTextBox.Text & " |SystemNumber: " & SystemNumberTextBox.Text & " |UserName: " & UserNameTextBox.Text & " |Password: " & PasswordTextBox.Text & " |Client: " & ClientTextBox.Text & " |Language: " & LanguageTextBox.Text, False)
+        '    LOGGER.Debug("HOST: " & HostTextBox.Text & " |SystemNumber: " & SystemNumberTextBox.Text & " |UserName: " & UserNameTextBox.Text & " |Password: " & PasswordTextBox.Text & " |Client: " & ClientTextBox.Text & " |Language: " & LanguageTextBox.Text)
         '    con.Open(False)
-        '    If LogErrorsOnly = False Then ClassLogger.Add(" >> SAP-Connection erfolgreich aufgebaut!", False)
+        '    LOGGER.Debug("SAP-Connection erfolgreich aufgebaut!")
-        '    If LogErrorsOnly = False Then ClassLogger.Add("", False)
+        '    LOGGER.Debug("")
         '    lblConnectionopen.Visible = True
         '    Me.Cursor = Cursors.Default
         'Catch ex As Exception
@@ -146,7 +146,7 @@ Public Class frmSAP_FuBa
                 lblSave.Visible = False
                 GridControl2.DataSource = Nothing
                 GridView2.Columns.Clear()
-                ClassLogger.Add(">> SAPResulttable is nothing", False)
+                LOGGER.Warn("SAPResulttable is nothing")
                 Exit Sub
             End If
             '######
@@ -165,12 +165,12 @@ Public Class frmSAP_FuBa
             Next
             createtablesql += ")"
             ''Die Tabelle anlegen
-            If LogErrorsOnly = False Then ClassLogger.Add(" >> Create Table: " & createtablesql, False)
+            LOGGER.Debug("Create Table: " & createtablesql)
             If ClassDatabase.Execute_non_Query_withConn(createtablesql, 1) = False Then
                 MsgBox("Error in creating TempTable: Check log", MsgBoxStyle.Critical)
                 Exit Sub
             End If
-            If LogErrorsOnly = False Then ClassLogger.Add(" >> table has been created", False)
+            LOGGER.Debug("table has been created")
 
             Dim alter = String.Format("ALTER TABLE {0} ADD GUID INTEGER NOT NULL IDENTITY(1,1)", tablename)
             ClassDatabase.Execute_non_Query_withConn(alter, 1)
@@ -215,7 +215,7 @@ Public Class frmSAP_FuBa
                 End Using
                 SQLconnect.Close()
                 Me.Cursor = Cursors.Default
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> Create table from SAP FuBa was successfull " & SAPResulttable.Rows.Count & " Rows were inserted to table '" & tablename & "'!", False)
+                LOGGER.Debug("Create table from SAP FuBa was successfull " & SAPResulttable.Rows.Count & " Rows were inserted to table '" & tablename & "'!")
                 MsgBox("Create table was successfull! " & vbNewLine & SAPResulttable.Rows.Count & " Rows were inserted to table '" & tablename & "'!", MsgBoxStyle.Information)
             Catch ex As Exception
                 MsgBox("Unexpected Error in SQL bulkCopy: " & ex.Message, MsgBoxStyle.Critical)
@@ -286,7 +286,7 @@ Public Class frmSAP_FuBa
             GridControl2.DataSource = Nothing
             GridView2.Columns.Clear()
             sw.Stop()
-            ClassLogger.Add(">> SAPResulttable is nothing", False)
+            LOGGER.Warn("SAPResulttable is nothing")
             Exit Sub
         End If
 
@@ -324,7 +324,7 @@ Public Class frmSAP_FuBa
             lblSave.Visible = False
             GridControl2.DataSource = Nothing
             GridView2.Columns.Clear()
-            ClassLogger.Add(">> Unexpected Error in GridControl2 >> DataTable 2: " & ex.Message, False)
+            LOGGER.Warn("Unexpected Error in GridControl2 >> DataTable 2: " & ex.Message)
             MsgBox("Error in GridControl2 >> DataTable: " & ex.Message, MsgBoxStyle.Critical)
         End Try
     End Sub

app/DD-Record-Organizer/frmSQLEditor.vb

@@ -37,7 +37,7 @@ Public Class frmSQLEditor
             Me.TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = MyConnectionString
             Me.TBDD_CONNECTIONTableAdapter.Fill(Me.DD_DMSDataSet.TBDD_CONNECTION)
         Catch ex As Exception
-            ClassLogger.Add(" - Unexpected Error in Load Connections - errpor: " & vbNewLine & ex.Message)
+            LOGGER.Warn(" - Unexpected Error in Load Connections - errpor: " & vbNewLine & ex.Message)
             MsgBox("Unexpected Error in Load Connections: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
        
@@ -150,7 +150,7 @@ Public Class frmSQLEditor
                     Return dataset
                 Else
 
-                    If LogErrorsOnly = True Then ClassLogger.Add(" >> It's an Oracle-Connection (ExecuteWithConnection)", False)
+                    LOGGER.Debug("It's an Oracle-Connection (ExecuteWithConnection)")
                     Dim sqlConnection As OracleConnection
                     Dim sqlCommand As OracleCommand
                     Dim sqlAdapter As New OracleDataAdapter
@@ -171,7 +171,7 @@ Public Class frmSQLEditor
             End If
 
         Catch ex As Exception
-            ClassLogger.Add(" - Unvorhergesehener Fehler bei TestSQL - Fehler: " & vbNewLine & ex.Message)
+            LOGGER.Warn(" - Unvorhergesehener Fehler bei TestSQL - Fehler: " & vbNewLine & ex.Message)
             MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei TestSQL:")
             Return Nothing
         End Try
@@ -319,7 +319,7 @@ Public Class frmSQLEditor
                 MsgBox("SQL-Befehl erfolgreich gespeichert!", MsgBoxStyle.Exclamation)
             End If
         Catch ex As Exception
-            ClassLogger.Add(" - Unexpected Error in Save SQL-Command for control - error: " & vbNewLine & ex.Message)
+            LOGGER.Warn(" - Unexpected Error in Save SQL-Command for control - error: " & vbNewLine & ex.Message)
             MsgBox("Unexpected Error in Save SQL-Command for control - error: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
     End Sub
@@ -344,7 +344,7 @@ Public Class frmSQLEditor
 
             End If
         Catch ex As Exception
-            ClassLogger.Add(" - Unexpected Error in Get Connection for Control - error: " & vbNewLine & ex.Message)
+            LOGGER.Warn(" - Unexpected Error in Get Connection for Control - error: " & vbNewLine & ex.Message)
             MsgBox("Unexpected Error in Get Connection for Control - error: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
     End Sub

app/DD-Record-Organizer/frmTask_Management.vb

@@ -47,7 +47,7 @@
                 Me.VWPMO_GUI_ENTITYTableAdapter.Fill(Me.DD_DMSDataSet.VWPMO_GUI_ENTITY)
             Catch ex As Exception
                 MsgBox("Error in VWPMO_GUI_ENTITYTableAdapter: " & ex.Message, MsgBoxStyle.Exclamation)
-                ClassLogger.Add(">> Error in VWPMO_GUI_ENTITYTableAdapter: " & ex.Message, False)
+                LOGGER.Warn("Error in VWPMO_GUI_ENTITYTableAdapter: " & ex.Message)
             End Try
             Load_TreeView()
             Me.TBPMO_WORKFLOWTableAdapter.Fill(Me.DD_DMSDataSet.TBPMO_WORKFLOW, USER_LANGUAGE)
@@ -288,7 +288,7 @@
             If DataGridView1.Item(0, i).Value Is Nothing = False Then
                 Dim i1 = DataGridView1.Item(0, i).Value
                 Dim del = "DELETE FROM TBPMO_WORKFLOW_ENTITY_STATE WHERE GUID = " & i1
-                If ClassDatabase.Execute_non_Query(del, False) Then
+                If ClassDatabase.Execute_non_Query(del) Then
                     Load_ENTITY_States("ENT")
                 End If
             End If

app/DD-Record-Organizer/frmTemplates.vb

@@ -132,7 +132,7 @@
 
                     For Each cc In doc.ContentControls
                         If Not IsNothing(cc) Then
-                            If LogErrorsOnly = False Then ClassLogger.Add(" >> Office-Pattern: " & cc.Tag, False)
+                            LOGGER.Debug("Office-Pattern: " & cc.Tag, False)
                             If Pattern_exists(cc.tag.ToString.ToUpper) = False Then
                                 TBPMO_TEMPLATE_PATTERNTableAdapter.cmdInsertBasics(cc.tag.ToString, USER_USERNAME, _TEMPLATE_ENTITY_ID)
                             End If

app/DD-Record-Organizer/frmUserKonfig.Designer.vb

@@ -825,9 +825,9 @@ Partial Class frmUserKonfig
         '
         'GridViewWH_Users1
         '
-        Me.GridViewWH_Users1.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridViewWH_Users1.Appearance.EvenRow.BackColor"), System.Drawing.Color)
+        Me.GridViewWH_Users1.Appearance.EvenRow.BackColor = System.Drawing.Color.LightBlue
         Me.GridViewWH_Users1.Appearance.EvenRow.Options.UseBackColor = True
-        Me.GridViewWH_Users1.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridViewWH_Users1.Appearance.FocusedRow.BackColor"), System.Drawing.Color)
+        Me.GridViewWH_Users1.Appearance.FocusedRow.BackColor = System.Drawing.Color.Fuchsia
         Me.GridViewWH_Users1.Appearance.FocusedRow.Options.UseBackColor = True
         Me.GridViewWH_Users1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn3, Me.GridColumn4, Me.GridColumn5, Me.GridColumn6})
         Me.GridViewWH_Users1.GridControl = Me.GridControlWH_Users1
@@ -882,9 +882,9 @@ Partial Class frmUserKonfig
         '
         'GridViewlUsers2Group
         '
-        Me.GridViewlUsers2Group.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridViewlUsers2Group.Appearance.EvenRow.BackColor"), System.Drawing.Color)
+        Me.GridViewlUsers2Group.Appearance.EvenRow.BackColor = System.Drawing.Color.LightBlue
         Me.GridViewlUsers2Group.Appearance.EvenRow.Options.UseBackColor = True
-        Me.GridViewlUsers2Group.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridViewlUsers2Group.Appearance.FocusedRow.BackColor"), System.Drawing.Color)
+        Me.GridViewlUsers2Group.Appearance.FocusedRow.BackColor = System.Drawing.Color.Fuchsia
         Me.GridViewlUsers2Group.Appearance.FocusedRow.Options.UseBackColor = True
         Me.GridViewlUsers2Group.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colSelect, Me.GridColumn1, Me.GridColumn2, Me.colID})
         Me.GridViewlUsers2Group.GridControl = Me.GridControlUsers2Group
@@ -993,9 +993,9 @@ Partial Class frmUserKonfig
         '
         'GridView2
         '
-        Me.GridView2.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridView2.Appearance.EvenRow.BackColor"), System.Drawing.Color)
+        Me.GridView2.Appearance.EvenRow.BackColor = System.Drawing.Color.LightBlue
         Me.GridView2.Appearance.EvenRow.Options.UseBackColor = True
-        Me.GridView2.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridView2.Appearance.FocusedRow.BackColor"), System.Drawing.Color)
+        Me.GridView2.Appearance.FocusedRow.BackColor = System.Drawing.Color.Fuchsia
         Me.GridView2.Appearance.FocusedRow.Options.UseBackColor = True
         Me.GridView2.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colNAME1})
         Me.GridView2.GridControl = Me.GridControl2
@@ -1187,9 +1187,9 @@ Partial Class frmUserKonfig
         '
         'GridViewUsersinClient
         '
-        Me.GridViewUsersinClient.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridViewUsersinClient.Appearance.EvenRow.BackColor"), System.Drawing.Color)
+        Me.GridViewUsersinClient.Appearance.EvenRow.BackColor = System.Drawing.Color.LightBlue
         Me.GridViewUsersinClient.Appearance.EvenRow.Options.UseBackColor = True
-        Me.GridViewUsersinClient.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridViewUsersinClient.Appearance.FocusedRow.BackColor"), System.Drawing.Color)
+        Me.GridViewUsersinClient.Appearance.FocusedRow.BackColor = System.Drawing.Color.Fuchsia
         Me.GridViewUsersinClient.Appearance.FocusedRow.Options.UseBackColor = True
         Me.GridViewUsersinClient.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn11, Me.GridColumn12, Me.GridColumn13, Me.GridColumn14})
         Me.GridViewUsersinClient.GridControl = Me.GridControlUsersinClient
@@ -1244,9 +1244,9 @@ Partial Class frmUserKonfig
         '
         'GridViewUser2Mandanten
         '
-        Me.GridViewUser2Mandanten.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridViewUser2Mandanten.Appearance.EvenRow.BackColor"), System.Drawing.Color)
+        Me.GridViewUser2Mandanten.Appearance.EvenRow.BackColor = System.Drawing.Color.LightBlue
         Me.GridViewUser2Mandanten.Appearance.EvenRow.Options.UseBackColor = True
-        Me.GridViewUser2Mandanten.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridViewUser2Mandanten.Appearance.FocusedRow.BackColor"), System.Drawing.Color)
+        Me.GridViewUser2Mandanten.Appearance.FocusedRow.BackColor = System.Drawing.Color.Fuchsia
         Me.GridViewUser2Mandanten.Appearance.FocusedRow.Options.UseBackColor = True
         Me.GridViewUser2Mandanten.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn7, Me.GridColumn8, Me.GridColumn9, Me.GridColumn10})
         Me.GridViewUser2Mandanten.GridControl = Me.GridControlUser2Mandanten
@@ -1579,9 +1579,9 @@ Partial Class frmUserKonfig
         '
         'GridView3
         '
-        Me.GridView3.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridView3.Appearance.EvenRow.BackColor"), System.Drawing.Color)
+        Me.GridView3.Appearance.EvenRow.BackColor = System.Drawing.Color.LightBlue
         Me.GridView3.Appearance.EvenRow.Options.UseBackColor = True
-        Me.GridView3.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridView3.Appearance.FocusedRow.BackColor"), System.Drawing.Color)
+        Me.GridView3.Appearance.FocusedRow.BackColor = System.Drawing.Color.Fuchsia
         Me.GridView3.Appearance.FocusedRow.Options.UseBackColor = True
         Me.GridView3.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn15, Me.GridColumn16, Me.GridColumn17, Me.GridColumn18})
         Me.GridView3.GridControl = Me.GridControl3
@@ -1679,9 +1679,9 @@ Partial Class frmUserKonfig
         '
         'GridViewUser
         '
-        Me.GridViewUser.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridViewUser.Appearance.EvenRow.BackColor"), System.Drawing.Color)
+        Me.GridViewUser.Appearance.EvenRow.BackColor = System.Drawing.Color.LightBlue
         Me.GridViewUser.Appearance.EvenRow.Options.UseBackColor = True
-        Me.GridViewUser.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridViewUser.Appearance.FocusedRow.BackColor"), System.Drawing.Color)
+        Me.GridViewUser.Appearance.FocusedRow.BackColor = System.Drawing.Color.Fuchsia
         Me.GridViewUser.Appearance.FocusedRow.Options.UseBackColor = True
         Me.GridViewUser.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colUSERNAME, Me.colNAME, Me.colEMAIL})
         Me.GridViewUser.GridControl = Me.GridControlUser

app/DD-Record-Organizer/frmUserKonfig.resx

@@ -1184,6 +1184,9 @@
   <data name="BindingNavigatorPositionItem.AutoSize" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
+  <data name="BindingNavigatorPositionItem.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Segoe UI, 9pt</value>
+  </data>
   <data name="BindingNavigatorPositionItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>50, 23</value>
   </data>
@@ -1776,7 +1779,7 @@
     <value>3, 3, 3, 3</value>
   </data>
   <data name="TabPage1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1124, 293</value>
+    <value>1128, 296</value>
   </data>
   <data name="TabPage1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -1811,12 +1814,6 @@
   <data name="GridControlWH_Users1.Location" type="System.Drawing.Point, System.Drawing">
     <value>667, 19</value>
   </data>
-  <data name="GridViewWH_Users1.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>LightBlue</value>
-  </data>
-  <data name="GridViewWH_Users1.Appearance.FocusedRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Fuchsia</value>
-  </data>
   <data name="GridColumn3.Caption" xml:space="preserve">
     <value>Selection</value>
   </data>
@@ -1874,12 +1871,6 @@
   <data name="GridControlUsers2Group.Location" type="System.Drawing.Point, System.Drawing">
     <value>229, 19</value>
   </data>
-  <data name="GridViewlUsers2Group.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>LightBlue</value>
-  </data>
-  <data name="GridViewlUsers2Group.Appearance.FocusedRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Fuchsia</value>
-  </data>
   <data name="colSelect.Caption" xml:space="preserve">
     <value>Selection</value>
   </data>
@@ -2140,7 +2131,7 @@ matchen</value>
     <value>0, 0</value>
   </data>
   <data name="TabControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1132, 319</value>
+    <value>1136, 322</value>
   </data>
   <data name="TabControl1.TabIndex" type="System.Int32, mscorlib">
     <value>6</value>
@@ -2158,7 +2149,7 @@ matchen</value>
     <value>0</value>
   </data>
   <data name="XtraTabPage1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1132, 319</value>
+    <value>1136, 322</value>
   </data>
   <data name="XtraTabPage1.Text" xml:space="preserve">
     <value>User-/Gruppenzuordnung</value>
@@ -2187,12 +2178,6 @@ matchen</value>
   <data name="GridControl2.Location" type="System.Drawing.Point, System.Drawing">
     <value>4, 41</value>
   </data>
-  <data name="GridView2.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>LightBlue</value>
-  </data>
-  <data name="GridView2.Appearance.FocusedRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Fuchsia</value>
-  </data>
   <data name="colNAME1.Caption" xml:space="preserve">
     <value>Group Name</value>
   </data>
@@ -2474,6 +2459,9 @@ matchen</value>
   <data name="ToolStripTextBox1.AutoSize" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
+  <data name="ToolStripTextBox1.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Segoe UI, 9pt</value>
+  </data>
   <data name="ToolStripTextBox1.Size" type="System.Drawing.Size, System.Drawing">
     <value>50, 23</value>
   </data>
@@ -2553,7 +2541,7 @@ matchen</value>
     <value>0, 0</value>
   </data>
   <data name="BindingNavigator1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1132, 25</value>
+    <value>1136, 25</value>
   </data>
   <data name="BindingNavigator1.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -2574,7 +2562,7 @@ matchen</value>
     <value>15</value>
   </data>
   <data name="TabGruppendefinition.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1132, 319</value>
+    <value>1136, 322</value>
   </data>
   <data name="TabGruppendefinition.Text" xml:space="preserve">
     <value>Gruppendefinition</value>
@@ -2603,12 +2591,6 @@ matchen</value>
   <data name="GridControlUsersinClient.Location" type="System.Drawing.Point, System.Drawing">
     <value>631, 17</value>
   </data>
-  <data name="GridViewUsersinClient.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>LightBlue</value>
-  </data>
-  <data name="GridViewUsersinClient.Appearance.FocusedRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Fuchsia</value>
-  </data>
   <data name="GridColumn11.Caption" xml:space="preserve">
     <value>Selection</value>
   </data>
@@ -2666,12 +2648,6 @@ matchen</value>
   <data name="GridControlUser2Mandanten.Location" type="System.Drawing.Point, System.Drawing">
     <value>187, 19</value>
   </data>
-  <data name="GridViewUser2Mandanten.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>LightBlue</value>
-  </data>
-  <data name="GridViewUser2Mandanten.Appearance.FocusedRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Fuchsia</value>
-  </data>
   <data name="GridColumn7.Caption" xml:space="preserve">
     <value>Selection</value>
   </data>
@@ -3029,6 +3005,9 @@ Mandant hinzufügen</value>
   <data name="ToolStripTextBox3.AutoSize" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
+  <data name="ToolStripTextBox3.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Segoe UI, 9pt</value>
+  </data>
   <data name="ToolStripTextBox3.Size" type="System.Drawing.Size, System.Drawing">
     <value>50, 23</value>
   </data>
@@ -3402,7 +3381,7 @@ Mandant hinzufügen</value>
     <value>0, 0</value>
   </data>
   <data name="TabControl3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1132, 319</value>
+    <value>1136, 322</value>
   </data>
   <data name="TabControl3.TabIndex" type="System.Int32, mscorlib">
     <value>38</value>
@@ -3420,7 +3399,7 @@ Mandant hinzufügen</value>
     <value>0</value>
   </data>
   <data name="XtraTabPage2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1132, 319</value>
+    <value>1136, 322</value>
   </data>
   <data name="XtraTabPage2.Text" xml:space="preserve">
     <value>Mandantenzuordnung/-definition</value>
@@ -3614,12 +3593,6 @@ Mandant hinzufügen</value>
   <data name="GridControl3.Location" type="System.Drawing.Point, System.Drawing">
     <value>11, 29</value>
   </data>
-  <data name="GridView3.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>LightBlue</value>
-  </data>
-  <data name="GridView3.Appearance.FocusedRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Fuchsia</value>
-  </data>
   <data name="GridColumn15.Caption" xml:space="preserve">
     <value>Selection</value>
   </data>
@@ -3669,7 +3642,7 @@ Mandant hinzufügen</value>
     <value>5</value>
   </data>
   <data name="XtraTabPage3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1132, 319</value>
+    <value>1136, 322</value>
   </data>
   <data name="XtraTabPage3.Text" xml:space="preserve">
     <value>Update Konfiguration User</value>
@@ -3830,12 +3803,6 @@ Mandant hinzufügen</value>
   <data name="GridControlUser.Location" type="System.Drawing.Point, System.Drawing">
     <value>765, 39</value>
   </data>
-  <data name="GridViewUser.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>LightBlue</value>
-  </data>
-  <data name="GridViewUser.Appearance.FocusedRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Fuchsia</value>
-  </data>
   <data name="colUSERNAME.Caption" xml:space="preserve">
     <value>Username</value>
   </data>

app/DD-Record-Organizer/frmUserKonfig_AddUsers.vb

@@ -107,7 +107,7 @@ Public Class frmUserKonfig_AddUsers
                 newUserRow.Surname = IIf((IsDBNull(NAME) Or IsNothing(NAME)), "", NAME)
                 newUserRow.Email = IIf((IsDBNull(email) Or IsNothing(email)), "", email)
             Catch ex As Exception
-                ClassLogger.Add("Unexpected Error in Read User LDAP-Configurations: " & vbNewLine)
+                LOGGER.Warn("Unexpected Error in Read User LDAP-Configurations: " & vbNewLine)
             End Try
             DD_ECMAdmin.TBAD_Users.Rows.Add(newUserRow)
         Next
@@ -164,14 +164,14 @@ Public Class frmUserKonfig_AddUsers
                         _Step = 8
                         If ClassDatabase.Execute_non_Query(SQL, False) = True Then
                             SQL = $"INSERT INTO TBDD_USER_MODULES (USER_ID,MODULE_ID,ADDED_WHO) VALUES
-                                ((SELECT MAX(GUID) FROM TBDD_USER),(SELECT T.GUID FROM TBDD_MODULES T WHERE T.SHORT_NAME = 'ADDI'),'{Environment.UserName}')"
+                                (SELECT MAX(GUID) FROM TBDD_USER),(SELECT T.GUID FROM TBDD_MODULES T WHERE T.SHORT_NAME = 'ADDI'),'{Environment.UserName}')"
                             ClassDatabase.Execute_non_Query(SQL, False)
                             _Step = 9
                             Dim ID = ClassDatabase.Execute_Scalar("SELECT MAX(GUID) FROM TBDD_USER")
-                            Dim msg = String.Format(">> USER {0}, {1} - {2} ADDED TO CONFIGURATION", NAME, PRENAME, oUSERNAME)
+                            Dim msg = String.Format("USER {0}, {1} - {2} ADDED TO CONFIGURATION", NAME, PRENAME, oUSERNAME)
                             _Step = 10
-                            ClassLogger.Add(msg, False)
+                            LOGGER.Info(msg)
-                            ClassHelper.InsertEssential_Log(ID, "USER-ID", msg.Replace(">> ", ""))
+                            ClassHelper.InsertEssential_Log(ID, "USER-ID", msg.Replace("", ""))
                             usersAdded += 1
                         Else
                             MsgBox("Unexpected Error In Adding User (" & oUSERNAME & ") : " & "Check the log!", MsgBoxStyle.Exclamation)
@@ -180,7 +180,7 @@ Public Class frmUserKonfig_AddUsers
                         _Step = 11
                         SQL = $"IF NOT EXISTS(SELECT T.GUID FROM TBDD_USER_MODULES T INNER JOIN TBDD_USER T1 ON T.USER_ID = T1.GUID INNER JOIN TBDD_MODULES T2 ON T.MODULE_ID = T2.GUID WHERE T2.SHORT_NAME = 'ADDI' AND T1.USERNAME = '{oUSERNAME}')
 	INSERT INTO TBDD_USER_MODULES (USER_ID,MODULE_ID,ADDED_WHO) VALUES
-		((SELECT GUID FROM TBDD_USER WHERE USERNAME = '{oUSERNAME}'),(SELECT T.GUID FROM TBDD_MODULES T WHERE T.SHORT_NAME = 'ADDI'),'{Environment.UserName}')"
+		(SELECT GUID FROM TBDD_USER WHERE USERNAME = '{oUSERNAME}'),(SELECT T.GUID FROM TBDD_MODULES T WHERE T.SHORT_NAME = 'ADDI'),'{Environment.UserName}')"
                         _Step = 12
                         If ClassDatabase.Execute_non_Query(SQL, False) = True Then
                             usersRefreshed += 1

app/DD-Record-Organizer/frmViewsUser.Designer.vb

@@ -69,7 +69,7 @@ Partial Class frmViewsUser
         Me.GridControl1.MainView = Me.GridView1
         Me.GridControl1.Name = "GridControl1"
         Me.GridControl1.ShowOnlyPredefinedDetails = True
-        Me.GridControl1.Size = New System.Drawing.Size(354, 283)
+        Me.GridControl1.Size = New System.Drawing.Size(364, 305)
         Me.GridControl1.TabIndex = 91
         Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1})
         '
@@ -150,7 +150,7 @@ Partial Class frmViewsUser
         Me.GridControlUsers2Menue.MainView = Me.GridViewlUsers2Menue
         Me.GridControlUsers2Menue.Name = "GridControlUsers2Menue"
         Me.GridControlUsers2Menue.ShowOnlyPredefinedDetails = True
-        Me.GridControlUsers2Menue.Size = New System.Drawing.Size(378, 283)
+        Me.GridControlUsers2Menue.Size = New System.Drawing.Size(378, 305)
         Me.GridControlUsers2Menue.TabIndex = 90
         Me.GridControlUsers2Menue.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewlUsers2Menue})
         '
@@ -224,7 +224,7 @@ Partial Class frmViewsUser
         Me.XtraTabControl1.Location = New System.Drawing.Point(0, 0)
         Me.XtraTabControl1.Name = "XtraTabControl1"
         Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1
-        Me.XtraTabControl1.Size = New System.Drawing.Size(868, 382)
+        Me.XtraTabControl1.Size = New System.Drawing.Size(878, 404)
         Me.XtraTabControl1.TabIndex = 92
         Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1})
         '
@@ -237,7 +237,7 @@ Partial Class frmViewsUser
         Me.XtraTabPage1.Controls.Add(Me.Label1)
         Me.XtraTabPage1.Controls.Add(Me.GridControlUsers2Menue)
         Me.XtraTabPage1.Name = "XtraTabPage1"
-        Me.XtraTabPage1.Size = New System.Drawing.Size(866, 357)
+        Me.XtraTabPage1.Size = New System.Drawing.Size(876, 379)
         Me.XtraTabPage1.Text = "Globale Suche"
         '
         'btndeleteUserConstructorRel
@@ -282,14 +282,14 @@ Partial Class frmViewsUser
         Me.Label1.Name = "Label1"
         Me.Label1.Size = New System.Drawing.Size(347, 26)
         Me.Label1.TabIndex = 91
-        Me.Label1.Text = "Konfigurieren Sie hier welche User Zugriff auf die globale Suche haben!" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Achtung:" & _
+        Me.Label1.Text = "Konfigurieren Sie hier welche User Zugriff auf die globale Suche haben!" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Achtung:" &
     " in dieser Suche werden alle Datensätze angezeigt!!"
         '
         'frmViewsUser
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(868, 382)
+        Me.ClientSize = New System.Drawing.Size(878, 404)
         Me.Controls.Add(Me.XtraTabControl1)
         Me.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)

app/DD-Record-Organizer/frmWM_ChangeDoctype.vb

@@ -136,7 +136,7 @@ Public Class frmWM_ChangeDoctype
                             AddDateTimePicker(DR.Item("GUID"), DR.Item("NAME"), y)
                         Case Else
                             MsgBox($"Please check the datatype of manual index ({ DR.Item("NAME")} - {type} - Refresh_Indices_Manual", MsgBoxStyle.Critical, "Achtung:")
-                            ClassLogger.Add(" - Datentyp nicht hinterlegt - LoadIndexe_Man")
+                            LOGGER.Warn(" - Datentyp nicht hinterlegt - LoadIndexe_Man")
                     End Select
 
                     anz += 1
@@ -377,7 +377,7 @@ Public Class frmWM_ChangeDoctype
                 Next
             End If
         Catch ex As Exception
-            ClassLogger.Add(" - Unvorhergesehener Unexpected error in Renew_ComboboxResults - Fehler: " & vbNewLine & ex.Message)
+            LOGGER.Warn(" - Unvorhergesehener Unexpected error in Renew_ComboboxResults - Fehler: " & vbNewLine & ex.Message)
             MsgBox(ex.Message, MsgBoxStyle.Critical, "Unvorhergesehener Unexpected error in Renew_ComboboxResults:")
         End Try
     End Sub
@@ -415,7 +415,7 @@ Public Class frmWM_ChangeDoctype
                     End If
                 Else
                     runinLZ = True
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >>sql enthält Platzhalter und wird erst während der Laufzeit gefüllt!", False)
+                    LOGGER.Debug(" >>sql enthält Platzhalter und wird erst während der Laufzeit gefüllt!", False)
                 End If
 
 
@@ -486,7 +486,7 @@ Public Class frmWM_ChangeDoctype
             End If
 
         Catch ex As Exception
-            ClassLogger.Add(" - Unvorhergesehener Unexpected error in AddVorschlag_ComboBox - Indexname: " & indexname & " - Fehler: " & vbNewLine & ex.Message)
+            LOGGER.Warn(" - Unvorhergesehener Unexpected error in AddVorschlag_ComboBox - Indexname: " & indexname & " - Fehler: " & vbNewLine & ex.Message)
             MsgBox(ex.Message, MsgBoxStyle.Critical, "Unvorhergesehener Unexpected error in AddVorschlag_ComboBox:")
         End Try
     End Sub

app/DD-Record-Organizer/frmWM_DoctypeConfig.vb

@@ -85,11 +85,11 @@ Public Class frmWM_DoctypeConfig
     Sub Refresh_Dokart(All As Boolean)
         Try
             If All = False Then
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> Dokumentarten für RecordOrganizer werden geladen", False)
+                LOGGER.Debug("Dokumentarten für RecordOrganizer werden geladen", False)
                 Me.TBDD_DOKUMENTARTTableAdapter.FillByPMO(Me.DD_DMSDataSet.TBDD_DOKUMENTART, USER_LANGUAGE)
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> Anzahl Dokumentarten: " & DD_DMSDataSet.TBDD_DOKUMENTART.Rows.Count, False)
+                LOGGER.Debug("Anzahl Dokumentarten: " & DD_DMSDataSet.TBDD_DOKUMENTART.Rows.Count, False)
             Else
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> Alle Dokumentarten werden geladen", False)
+                LOGGER.Debug("Alle Dokumentarten werden geladen", False)
                 Me.TBDD_DOKUMENTARTTableAdapter.Fill(Me.DD_DMSDataSet.TBDD_DOKUMENTART, USER_LANGUAGE)
             End If
 

app/DD-Record-Organizer/frmWM_EntityImport.vb

@@ -152,28 +152,28 @@ Public Class frmWM_EntityImport
                             If dt.Rows.Count = 1 Then
                                 Dim indexname = dt.Rows(0).Item("IDXNAME_ENTITYID").ToString
                                 Dim idxvalue = CURRENT_ENTITY_ID
-                        If LogErrorsOnly = False Then ClassLogger.Add(" >> Entity-ID: " & idxvalue.ToString, False)
+                        LOGGER.Debug("Entity-ID: " & idxvalue.ToString, False)
                         indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, idxvalue, clsWindream.MY_WDOBJECTTYPE)
                         If indexierung_erfolgreich = False Then
                             MsgBox("Error in indexing file Entity - See log", MsgBoxStyle.Critical)
                         End If
                         indexname = dt.Rows(0).Item("IDXNAME_PARENTID").ToString
                         idxvalue = CURRENT_PARENT_ENTITY_ID
-                        If LogErrorsOnly = False Then ClassLogger.Add(" >> Parent-ID: " & idxvalue.ToString, False)
+                        LOGGER.Debug("Parent-ID: " & idxvalue.ToString, False)
                         indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, idxvalue, clsWindream.MY_WDOBJECTTYPE)
                         If indexierung_erfolgreich = False Then MsgBox("Error in indexing file Parent-ID - See log", MsgBoxStyle.Critical)
                         '###
                         'den Record-Key auslesen
                         indexname = dt.Rows(0).Item("IDXNAME_PARENTID").ToString
                         idxvalue = CURRENT_RECORD_ID
-                        If LogErrorsOnly = False Then ClassLogger.Add(" >> Record-ID: " & idxvalue.ToString, False)
+                        LOGGER.Debug("Record-ID: " & idxvalue.ToString, False)
                         indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, idxvalue, clsWindream.MY_WDOBJECTTYPE)
                         If indexierung_erfolgreich = False Then MsgBox("Unexpected Error in indexing file Record-ID - See log", MsgBoxStyle.Critical)
 
                         'den Doctype-Key auslesen
                         indexname = dt.Rows(0).Item("IDXNAME_DOCTYPE").ToString
                         idxvalue = CURRENT_DOKARTSTRING
-                        If LogErrorsOnly = False Then ClassLogger.Add(" >> Doctype: " & idxvalue.ToString, False)
+                        LOGGER.Debug("Doctype: " & idxvalue.ToString, False)
                         indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, idxvalue, clsWindream.MY_WDOBJECTTYPE)
                         If indexierung_erfolgreich = False Then MsgBox("Unexpected Error in indexing file Doctype - See log", MsgBoxStyle.Critical)
                         '####

app/DD-Record-Organizer/frmWM_Import_Doc_Record.vb

@@ -136,7 +136,7 @@ Public Class frmWM_Import_Doc_Record
             PROFILE_SQL_PARENT = DT.Rows(0).Item("SQL_PARENT_RECORD")
             PROFILE_ONLY_RECORD = DT.Rows(0).Item("ONLY_RECORD_CREATING")
             If PROFILE_ONLY_RECORD = True Then
-                ClassLogger.Add(">> Only Records shall be created", False)
+                LOGGER.Info("Only Records shall be created")
             End If
             PROFILE_NEW_OT = DT.Rows(0).Item("NEW_OBJECTTYPE")
         Catch ex As Exception
@@ -166,10 +166,10 @@ Public Class frmWM_Import_Doc_Record
             End If
             'nur weiter machen wenn kein BackgroundWorker mehr läuft
             If Not Me.bwsearch.IsBusy Then
-                ClassLogger.Add("======================================================================", False)
+                LOGGER.Info("======================================================================")
-                ClassLogger.Add("Import RecordFiles started                                    ", False)
+                LOGGER.Info("Import RecordFiles started                                    ")
-                ClassLogger.Add(Now, False)
+                LOGGER.Info(Now)
-                ClassLogger.Add("======================================================================", False)
+                LOGGER.Info("======================================================================")
                 Me.lblStatusThread.Text = "Status: Import läuft"
 
                 bwsearch.RunWorkerAsync()
@@ -196,14 +196,14 @@ Public Class frmWM_Import_Doc_Record
                 End If
             Else
                 If Me.bwsearch.IsBusy Then
-                    ClassLogger.Add(">> Attention: Thread Search still working - Threads will be aborted.", False)
+                    LOGGER.Info("Attention: Thread Search still working - Threads will be aborted.")
                     Me.bwsearch.CancelAsync()
                     MsgBox("Threads were cancelled!", MsgBoxStyle.Information)
                 End If
             End If
         Catch ex As Exception
             MsgBox("Unexpexted error in Start_Profile: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-            ClassLogger.Add("Unexpexted error in Start_Profile: " & ex.Message, True)
+            LOGGER.Info("Unexpexted error in Start_Profile: " & ex.Message)
         End Try
     End Sub
     Sub Work_Search()
@@ -211,24 +211,24 @@ Public Class frmWM_Import_Doc_Record
             RUN_SEARCH()
         Catch ex As Exception
             MsgBox("Unexpexted error in Start_Search: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-            ClassLogger.Add("Unexpexted error in Start_Search: " & ex.Message, True)
+            LOGGER.Info("Unexpexted error in Start_Search: " & ex.Message)
         End Try
     End Sub
     Sub RUN_SEARCH()
         Try
             windreamSucheErgebnisse = clsWD_GET.GetSearchDocuments(PROFILE_WD_SEARCH)
-            ClassLogger.Add(">> Files Result: " & windreamSucheErgebnisse.Count, False)
+            LOGGER.Info("Files Result: " & windreamSucheErgebnisse.Count)
             Search_Completed = True
         Catch ex As Exception
-            ClassLogger.Add("Error in RUN_SEARCH - Error: " & ex.Message)
+            LOGGER.Info("Error in RUN_SEARCH - Error: " & ex.Message)
         End Try
     End Sub
     Private Sub bwsearch_RunWorkerCompleted(ByVal sender As Object, ByVal e As System.ComponentModel.RunWorkerCompletedEventArgs)
 
         'Dim minutes = CInt(System.DateTime.Now.Subtract(CURRENT_START_DATETIME).Minutes)
-            'If minutes >= 1 Then
+        'If minutes >= 1 Then
-            '    Logger(" >> Suchdauer >= 1 Minute aber letzendlich ausgeführt (" & Now & ")", True)
+        '    Logger("Suchdauer >= 1 Minute aber letzendlich ausgeführt (" & Now & ")")
-            'End If
+        'End If
 
     End Sub
     Sub Work_Files()
@@ -244,21 +244,21 @@ Public Class frmWM_Import_Doc_Record
                 Dim filename = "W:" & aktivesDokument.aPath
                 Dim DOK_FOLDER As String = IO.Path.GetDirectoryName(filename)
 
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> Working on file '" & IO.Path.GetFileName(filename) & "'", False)
+                LOGGER.Debug("Working on file '" & IO.Path.GetFileName(filename) & "'")
                 If Folder <> DOK_FOLDER Then
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Folderpath '" & DOK_FOLDER & "'", False)
+                    LOGGER.Debug("Folderpath '" & DOK_FOLDER & "'")
                     Folder = DOK_FOLDER
                 End If
 
                 If Create_Record() = True Then
                     If PROFILE_SQL_PARENT <> "" Then
                         If Create_Parent_Record() = False Then
-                            ClassLogger.Add(">> Create Parent-Record not successful!", False)
+                            LOGGER.Warn("Create Parent-Record not successful!")
                         End If
                     End If
                     If PROFILE_ONLY_RECORD = False Then 'Es sollen auch Dateien importiert werden
                         If Import_File() = False Then
-                            ClassLogger.Add(">> No import of file! Exit For each!", False)
+                            LOGGER.Warn("No import of file! Exit For each!")
                             Continue For
                         End If
                     End If
@@ -268,19 +268,19 @@ Public Class frmWM_Import_Doc_Record
                         Dim DT As DataTable = ClassDatabase.Return_Datatable(sql)
                         If DT Is Nothing = False Then 'CHECK DD
                             If DT.Rows.Count >= 0 Then
-                                If LogErrorsOnly = False Then ClassLogger.Add(" >> " & DT.Rows.Count & " Control-Index-Rows", False)
+                                LOGGER.Debug("" & DT.Rows.Count & " Control-Index-Rows")
                                 Dim err As Boolean = False
                                 For Each row As DataRow In DT.Rows
                                     'Den Wert aus dem Index des Dokuments auslesen und in den ControlValue schreiben
                                     Dim idxvalue
                                     Dim indexname_old = row.Item("STRING2").ToString
-                                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Read Value 2 for windream-index: '" & indexname_old & "'", False)
+                                    LOGGER.Debug("Read Value 2 for windream-index: '" & indexname_old & "'")
                                     Try
                                         idxvalue = aktivesDokument.GetVariableValue(indexname_old)
-                                        If LogErrorsOnly = False Then ClassLogger.Add(" >> idxvalue from windream: '" & idxvalue.ToString & "'", False)
+                                        LOGGER.Debug("idxvalue from windream: '" & idxvalue.ToString & "'")
                                     Catch ex As Exception
                                         err = True
-                                        ClassLogger.Add(">> Error Reading Value 2 for windream-index '" & indexname_old & "' - Error: " & ex.Message, False)
+                                        LOGGER.Warn("Error Reading Value 2 for windream-index '" & indexname_old & "' - Error: " & ex.Message)
                                         Continue For
                                     End Try
 
@@ -293,17 +293,17 @@ Public Class frmWM_Import_Doc_Record
                                     'ByVal WD_File As String, ByVal _Indexname As String, ByVal _Value As String
                                 Next
                             Else
-                                ClassLogger.Add(">>There are no control-index relations defined!", False)
+                                LOGGER.Info(">>There are no control-index relations defined!")
                             End If
                         Else
-                            If LogErrorsOnly = False Then ClassLogger.Add(" >> No control-values configured!", False)
+                            LOGGER.Debug("No control-values configured!")
                         End If
                     Else
-                        If LogErrorsOnly = False Then ClassLogger.Add(" >> REC_EXISTS = True - no control values to be set!", False)
+                        LOGGER.Debug("REC_EXISTS = True - no control values to be set!")
                     End If
 
                 Else
-                    ClassLogger.Add(">> Create Record not successful!", False)
+                    LOGGER.Warn("Create Record not successful!")
                 End If
 
                 ' 
@@ -334,19 +334,19 @@ Public Class frmWM_Import_Doc_Record
                 Dim elementohneSZ = element.Value.Replace("[%", "")
                 elementohneSZ = elementohneSZ.Replace("]", "")
                 ' für den Platzhalter den WErt aus windream auslesen
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> Read value for windream-index: '" & elementohneSZ & "'", False)
+                LOGGER.Debug("Read value for windream-index: '" & elementohneSZ & "'")
                 Dim idxvalue
                 Try
                     idxvalue = aktivesDokument.GetVariableValue(elementohneSZ)
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> idxvalue from windream: '" & idxvalue.ToString & "'", False)
+                    LOGGER.Debug("idxvalue from windream: '" & idxvalue.ToString & "'")
                 Catch ex As Exception
-                    ClassLogger.Add(">> Regex Doctype SQL: Error reading Value for windream-index '" & elementohneSZ & "' - Error: " & ex.Message, False)
+                    LOGGER.Warn("Regex Doctype SQL: Error reading Value for windream-index '" & elementohneSZ & "' - Error: " & ex.Message)
                     Continue For
                 End Try
                 ' den Platzhalter für den auszulesenden View durch den Viewnamen ersetzen
                 SQL_FILE_DOCTYPE = SQL_FILE_DOCTYPE.Replace(element.Value, idxvalue.ToString)
             Next
-            If LogErrorsOnly = False Then ClassLogger.Add(" >> Executing Doctype SQL: " & SQL_FILE_DOCTYPE, False)
+            LOGGER.Debug("Executing Doctype SQL: " & SQL_FILE_DOCTYPE)
             Dim DokTYPE_ID = ClassDatabase.Execute_Scalar(SQL_FILE_DOCTYPE)
             '#####
 
@@ -428,31 +428,31 @@ Public Class frmWM_Import_Doc_Record
                             Sql = "SELECT STRING2 FROM TBPMO_WD_IMPORT_PROFILE_IDX WHERE STRING1 = 'INDEX_RECORD_ID' AND PROFILE_ID = " & cmbImportProfile.SelectedValue
                             RecordIndex = ClassDatabase.Execute_Scalar(Sql)
                             If clsWD_SET.IndexFile(CURRENT_FILEIN_WD, RecordIndex, IMPORT_REC_ID, DT.Rows(0).Item(1)) Then
-                                If LogErrorsOnly = False Then ClassLogger.Add(" >> Record Index was written", False)
+                                LOGGER.Debug("Record Index was written")
                             End If
                         End If
 
                         If PROFILE_IDX_WORKED <> "" Then
-                            If LogErrorsOnly = False Then ClassLogger.Add(" >> Setting the Exported to ADDI-Flag - windream-index '" & PROFILE_IDX_WORKED & "'", False)
+                            LOGGER.Debug("Setting the Exported to ADDI-Flag - windream-index '" & PROFILE_IDX_WORKED & "'")
                             clsWD_SET.File_SetBooleanIndex(True, aktivesDokument, PROFILE_IDX_WORKED, False)
                         End If
                         _Filesimported += 1
                         Return True
                     Else
-                        ClassLogger.Add(">> File was not imported!", False)
+                        LOGGER.Warn("File was not imported!")
                         Return False
                     End If
                 End If
             Else
-                ClassLogger.Add(">> No doctype-ID found", False)
+                LOGGER.Warn("No doctype-ID found")
-                ClassLogger.Add(">> SQL: " & SQL_FILE_DOCTYPE, False)
+                LOGGER.Warn("SQL: " & SQL_FILE_DOCTYPE)
                 If REC_ADDED = True Then
                     ClassHelper.DeleteRecord(IMPORT_REC_ID)
                     Return False
                 End If
             End If
         Catch ex As Exception
-            ClassLogger.Add(">> Unexpected Error in Import/IndexFile: " & ex.Message, False)
+            LOGGER.Warn("Unexpected Error in Import/IndexFile: " & ex.Message)
             MsgBox("Unexpected Error in Import/IndexFile: " & ex.Message, MsgBoxStyle.Critical)
             Return False
         End Try
@@ -476,23 +476,23 @@ Public Class frmWM_Import_Doc_Record
                     Dim elementohneSZ = element.Value.Replace("[%", "")
                     elementohneSZ = elementohneSZ.Replace("]", "")
                     ' für den Platzhalter den WErt aus windream auslesen
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Read value 1 for windream-index: '" & elementohneSZ & "'", False)
+                    LOGGER.Debug("Read value 1 for windream-index: '" & elementohneSZ & "'")
                     Dim idxvalue
                     Try
                         idxvalue = aktivesDokument.GetVariableValue(elementohneSZ)
-                        If LogErrorsOnly = False Then ClassLogger.Add(" >> idxvalue from windream: '" & idxvalue.ToString & "'", False)
+                        LOGGER.Debug("idxvalue from windream: '" & idxvalue.ToString & "'")
                     Catch ex As Exception
-                        ClassLogger.Add(">> Regex Unique SQL: Error reading Value 1 for windream-index '" & elementohneSZ & "' - Error: " & ex.Message, False)
+                        LOGGER.Warn("Regex Unique SQL: Error reading Value 1 for windream-index '" & elementohneSZ & "' - Error: " & ex.Message)
                         Continue For
                     End Try
                     ' den Platzhalter für den auszulesenden View durch den Viewnamen ersetzen
                     SQL_UNIQUE_FILE = SQL_UNIQUE_FILE.Replace(element.Value, idxvalue.ToString)
                 Next
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> Executing Unique SQL: " & SQL_UNIQUE_FILE, False)
+                LOGGER.Debug("Executing Unique SQL: " & SQL_UNIQUE_FILE)
                 IMPORT_REC_ID = ClassDatabase.Execute_Scalar(SQL_UNIQUE_FILE)
             End If
             If IMPORT_REC_ID = Nothing Then
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> Record is new!", False)
+                LOGGER.Debug("Record is new!")
                 'Den Record inserten
 
                 Dim recordId = ClassRecordCommands.CreateRecordProcedure(PROFILE_ENTITY)
@@ -500,19 +500,18 @@ Public Class frmWM_Import_Doc_Record
                 If recordId > 0 Then
                     IMPORT_REC_ID = recordId
                     REC_ADDED = True
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> New Record-ID: " & IMPORT_REC_ID.ToString, False)
+                    LOGGER.Debug("New Record-ID: " & IMPORT_REC_ID.ToString)
                     _RecordsAdded += 1
                 Else
                     Throw New Exception("Could not create Record")
                 End If
             Else
-                ClassLogger.Add(">> ## RECORD already exists - Record-ID: '" & IMPORT_REC_ID.ToString & "' ##", False)
+                LOGGER.Warn("## RECORD already exists - Record-ID: '" & IMPORT_REC_ID.ToString & "' ##")
-                If LogErrorsOnly = True Then ClassLogger.Add(">> Unique SQL: " & SQL_UNIQUE_FILE, False)
                 IMP_REC_EXISTS = True
             End If
             Return True
         Catch ex As Exception
-            ClassLogger.Add(">> Unexpected Error in Create-Record: " & ex.Message, False)
+            LOGGER.Warn("Unexpected Error in Create-Record: " & ex.Message)
             MsgBox("Unexpected Error in Create-Record: " & ex.Message, MsgBoxStyle.Critical)
             Return False
         End Try
@@ -533,36 +532,36 @@ Public Class frmWM_Import_Doc_Record
                 Dim elementohneSZ = element.Value.Replace("[%", "")
                 elementohneSZ = elementohneSZ.Replace("]", "")
                 ' für den Platzhalter den WErt aus windream auslesen
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> Read parent value for windream-index: '" & elementohneSZ & "'", False)
+                LOGGER.Debug("Read parent value for windream-index: '" & elementohneSZ & "'")
                 Dim idxvalue
                 Try
                     idxvalue = aktivesDokument.GetVariableValue(elementohneSZ)
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> parent idxvalue from windream: '" & idxvalue.ToString & "'", False)
+                    LOGGER.Debug("parent idxvalue from windream: '" & idxvalue.ToString & "'")
                 Catch ex As Exception
-                    ClassLogger.Add(">> Regex Unique SQL: Error reading parent Value for windream-index '" & elementohneSZ & "' - Error: " & ex.Message, False)
+                    LOGGER.Warn("Regex Unique SQL: Error reading parent Value for windream-index '" & elementohneSZ & "' - Error: " & ex.Message)
                     Continue For
                 End Try
                 ' den Platzhalter für den auszulesenden View durch den Viewnamen ersetzen
                 SQL_PARENT = SQL_PARENT.Replace(element.Value, idxvalue.ToString)
             Next
-            If LogErrorsOnly = False Then ClassLogger.Add(" >> Executing parent SQL: " & SQL_PARENT, False)
+            LOGGER.Debug("Executing parent SQL: " & SQL_PARENT)
             IMP_PARENT_REC_ID = ClassDatabase.Execute_Scalar(SQL_PARENT)
             If IMP_PARENT_REC_ID = Nothing Then
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> No PARENT_RECORD found!", False)
+                LOGGER.Debug("No PARENT_RECORD found!")
                 'Den Record inserten
 
                 Dim recordId = ClassRecordCommands.CreateRecordProcedure(PROFILE_ENTITY)
 
                 If recordId > 0 Then
                     IMP_PARENT_REC_ID = recordId
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> New PARENT_RECORD-ID: " & IMP_PARENT_REC_ID.ToString, False)
+                    LOGGER.Debug("New PARENT_RECORD-ID: " & IMP_PARENT_REC_ID.ToString)
                     _RecordsAdded += 1
                 Else
                     Throw New Exception("Could not create Record. Check PRPMO_CREATE_RECORD Procedure.")
                 End If
             Else
-                ClassLogger.Add(">> ## PARENT_RECORD already exists - PARENT_RECORD-ID: '" & IMP_PARENT_REC_ID.ToString & "' ##", False)
+                LOGGER.Warn("## PARENT_RECORD already exists - PARENT_RECORD-ID: '" & IMP_PARENT_REC_ID.ToString & "' ##")
-                If LogErrorsOnly = True Then ClassLogger.Add(">> parent SQL: " & SQL_PARENT, False)
+                LOGGER.Debug(" parent SQL: " & SQL_PARENT)
             End If
             Dim sql = String.Format("SELECT GUID FROM TBPMO_RECORD_CONNECT WHERE RECORD1_ID = {0} AND  RECORD2_ID = {1}", IMP_PARENT_REC_ID, IMPORT_REC_ID)
             Dim result = ClassDatabase.Execute_Scalar(sql)
@@ -571,7 +570,7 @@ Public Class frmWM_Import_Doc_Record
             End If
             Return True
         Catch ex As Exception
-            ClassLogger.Add(">> Unexpected Error in Create-Parent-Record: " & ex.Message, False)
+            LOGGER.Warn("Unexpected Error in Create-Parent-Record: " & ex.Message)
             MsgBox("Unexpected Error in Create-Parent-Record: " & ex.Message, MsgBoxStyle.Critical)
             Return False
         End Try

app/DD-Record-Organizer/frmWM_IndexFile.vb

@@ -26,7 +26,7 @@ Public Class frmWM_IndexFile
             stopwatch.Stop()
             Dim message = String.Format("{0, 5}ms || {1}", stopwatch.ElapsedMilliseconds, label)
             Console.WriteLine(message)
-            If LogErrorsOnly = False Then ClassLogger.Add(message, False)
+            LOGGER.Debug(message, False)
             Return stopwatch.ElapsedMilliseconds
         End Function
 
@@ -115,7 +115,7 @@ Public Class frmWM_IndexFile
                         Dim indexname
                         ''den Record_Key auslesen
                         'Dim indexname = DT.Rows(0).Item("IDXNAME_RECORDID").ToString
-                        'If LogErrorsOnly = False Then ClassLogger.Add(" >> Record-ID: " & CURRENT_RECORD_ID.ToString, False)
+                        'LOGGER.Debug("Record-ID: " & CURRENT_RECORD_ID.ToString, False)
                         'indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, CURRENT_RECORD_ID, clsWindream.MY_WDOBJECTTYPE)
                         'If indexierung_erfolgreich = False Then
                         '    err = True
@@ -125,7 +125,7 @@ Public Class frmWM_IndexFile
                         'End If
                         'den Entity-Key auslesen
                         'indexname = DT.Rows(0).Item("IDXNAME_ENTITYID").ToString
-                        'If LogErrorsOnly = False Then ClassLogger.Add(" >> Entity-ID: " & CURRENT_ENTITY_ID.ToString, False)
+                        'LOGGER.Debug("Entity-ID: " & CURRENT_ENTITY_ID.ToString, False)
                         'indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, CURRENT_ENTITY_ID, clsWindream.MY_WDOBJECTTYPE)
                         'If indexierung_erfolgreich = False Then
                         '    err = True
@@ -138,7 +138,7 @@ Public Class frmWM_IndexFile
                         'End If
                         'den Doctype auslesen
                         indexname = DTTBPMO_WD_OBJECTTYPE.Rows(0).Item("IDXNAME_DOCTYPE").ToString
-                        If LogErrorsOnly = False Then ClassLogger.Add(" >> Doctype: " & vDokart.ToString, False)
+                        LOGGER.Debug("Doctype: " & vDokart.ToString, False)
                         indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, vDokart, clsWindream.MY_WDOBJECTTYPE)
                         If indexierung_erfolgreich = False Then
                             err = True
@@ -185,27 +185,27 @@ Public Class frmWM_IndexFile
                                 ' alle Vorkommen innerhalbd er Namenkonvention durchlaufen
                                 For Each element As System.Text.RegularExpressions.Match In elemente
 
-                                    If LogErrorsOnly = False Then ClassLogger.Add(" >> element in RegeX: " & element.Value, False)
+                                    LOGGER.Debug("element in RegeX: " & element.Value, False)
                                     Select Case element.Value.Substring(2, 1).ToUpper
                                         'Nur automatische Indizes auswerten
                                         Case "A"
                                             Dim APattern = element.Value.Substring(3, element.Value.Length - 4)
                                             If APattern.Contains("#") Then
-                                                If LogErrorsOnly = False Then ClassLogger.Add(" >> element filled with Record-Data.......: ", False)
+                                                LOGGER.Debug("element filled with Record-Data.......: ", False)
                                                 Dim split() As String = APattern.Split("#")
                                                 If split.Length = 2 Then
                                                     Dim CONTROL_ID = split(1)
-                                                    If LogErrorsOnly = False Then ClassLogger.Add(" >> CONTROL_ID: " & CONTROL_ID, False)
+                                                    LOGGER.Debug("CONTROL_ID: " & CONTROL_ID, False)
                                                     If IsNumeric(CONTROL_ID) Then
                                                         Dim CONTROLVALUE = ClassControlValues.Get_Control_Value_for_ID(CONTROL_ID, CURRENT_RECORD_ID)
                                                         If IsNothing(CONTROLVALUE) Then
-                                                            ClassLogger.Add(">> Index should be filled with value of Control-ID '" & CONTROL_ID & "', but result was nothing.", False)
+                                                            LOGGER.Warn("Index should be filled with value of Control-ID '" & CONTROL_ID & "', but result was nothing.", False)
-                                                            ClassLogger.Add(">> SQL-Command: " & CURRENT_LAST_SQL)
+                                                            LOGGER.Warn("SQL-Command: " & CURRENT_LAST_SQL)
                                                             idxvalue = ""
                                                         Else
                                                             If IsDBNull(CONTROLVALUE) Then
-                                                                ClassLogger.Add(">> Index should be filled with value of Control-ID '" & CONTROL_ID & "', but result was DBNULL.", False)
+                                                                LOGGER.Warn("Index should be filled with value of Control-ID '" & CONTROL_ID & "', but result was DBNULL.", False)
-                                                                ClassLogger.Add(">> SQL-Command: " & CURRENT_LAST_SQL)
+                                                                LOGGER.Warn("SQL-Command: " & CURRENT_LAST_SQL)
                                                                 idxvalue = ""
                                                             Else
                                                                 idxvalue = CONTROLVALUE
@@ -220,7 +220,7 @@ Public Class frmWM_IndexFile
 
                                 Next
                             End If
-                            If LogErrorsOnly = False Then ClassLogger.Add(" >> Value for Indexing : '" & idxvalue.ToString & "'", False)
+                            LOGGER.Debug("Value for Indexing : '" & idxvalue.ToString & "'", False)
                             Count += 1
                             indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, idxvalue, clsWindream.MY_WDOBJECTTYPE)
                             If indexierung_erfolgreich = False Then
@@ -248,7 +248,7 @@ Public Class frmWM_IndexFile
                 'Nun alles aufrüumen und die neue DocID holen
 
                 If indexierung_erfolgreich = True Then
-                    ClassLogger.Add(">> File was correctly imported and indexed: " & CURRENT_FILEIN_WD, False)
+                    LOGGER.Info("File was correctly imported and indexed: " & CURRENT_FILEIN_WD, False)
                     Dim stg As String = "Datei erfolgreich nach windream übertragen"
                     Dim stg1 As String = "Erfolgsmeldung"
                     If USER_LANGUAGE <> "de-DE" Then
@@ -275,7 +275,7 @@ Public Class frmWM_IndexFile
 
                     If Not IsNothing(CURRENT_DOC_ID) Then
                         ClassHelper.InsertEssential_Log(CURRENT_DOC_ID, "DOC_ID", "File was imported and indexed!")
-                        ClassLogger.Add(String.Format(">> File-Import was finished - DocID: {0} ", CURRENT_DOC_ID), False)
+                        LOGGER.Info(String.Format("File-Import was finished - DocID: {0} ", CURRENT_DOC_ID), False)
                         Dim delete = False
                         'Die Originaldatei löschen
                         If droptype = "dragdrop file" And indexierung_erfolgreich = True Then
@@ -332,7 +332,7 @@ Public Class frmWM_IndexFile
                             stg = "Unexpected Error: Could not get a docId for transmitted file!"
 
                         End If
-                        ClassLogger.Add(stg, True)
+                        LOGGER.Warn(stg)
                         MsgBox(stg, MsgBoxStyle.Critical, stg1)
                     End If
                 Else
@@ -362,7 +362,7 @@ Public Class frmWM_IndexFile
     '            ' MsgBox(DT.Rows.Count.ToString)
     '            For Each DR_AUTOINDEX As DataRow In DD_DMSDataSet.VWDDINDEX_AUTOM.Rows
     '                Dim indexname As String = DR_AUTOINDEX.Item("INDEXNAME")
-    '                If LogErrorsOnly = False Then ClassLogger.Add(" >> Build Automatischer Index '" & indexname & "'", False)
+    '                LOGGER.Debug("Build Automatischer Index '" & indexname & "'", False)
     '                If DR_AUTOINDEX.Item("SQL_RESULT").ToString <> String.Empty And CBool(DR_AUTOINDEX.Item("SQL_ACTIVE")) = True Then
     '                    ' Regulären Ausdruck zum Auslesen der windream-Indexe definieren
     '                    Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}"
@@ -375,32 +375,32 @@ Public Class frmWM_IndexFile
     '                    ' alle Vorkommen der Indexe im SQL-String durchlaufen
     '                    For Each element As System.Text.RegularExpressions.Match In elemente
     '                        ' MsgBox(element.Value.ToUpper)
-    '                        If LogErrorsOnly = False Then ClassLogger.Add(" >> Element: '" & element.Value & "'", False)
+    '                        LOGGER.Debug("Element: '" & element.Value & "'", False)
     '                        '' wenn es sich nicht um dedizeirte Werte handelt (es sollen ja nur die Indexe ausgelesen werden)
     '                        'If Not element.Value.ToUpper = "[%SPALTE]" And Not element.Value.ToUpper = "[%VIEW]" Then
     '                        'die Zeichen [% und ] entfernen (liefert den wirklichen windream-Index)
     '                        Dim elementOhneSonderzeichen As String = element.Value.Substring(2, element.Value.Length - 3)
-    '                        If LogErrorsOnly = False Then ClassLogger.Add(" >> elementOhneSonderzeichen: '" & elementOhneSonderzeichen & "'", False)
+    '                        LOGGER.Debug("elementOhneSonderzeichen: '" & elementOhneSonderzeichen & "'", False)
     '                        'den Platzhalter im SQL-String durch den Wert ersetzen
     '                        Dim manIndexwert As String = GetManIndex_Value(elementOhneSonderzeichen, "IDX_AUTO")
     '                        If manIndexwert <> "" Then
     '                            SqlString = SqlString.Replace(element.Value, manIndexwert)
-    '                            If LogErrorsOnly = False Then ClassLogger.Add(" >> zusammengesetzter SQL-String: " & SqlString, False)
+    '                            LOGGER.Debug("zusammengesetzter SQL-String: " & SqlString, False)
     '                        Else
-    '                            ClassLogger.Add(" - ACHTUNG: manIndexwert = String.Empty - Funktion: FillIndexe_Autom", False)
+    '                            Logger.Warn(" - ACHTUNG: manIndexwert = String.Empty - Funktion: FillIndexe_Autom", False)
     '                            Return False
     '                        End If
     '                    Next
-    '                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Ausführen SQL....", False)
+    '                    LOGGER.Debug("Ausführen SQL....", False)
     '                    Dim automatischerValue As String = ""
     '                    automatischerValue = Get_AutomatischerIndex_SQL(SqlString, DR_AUTOINDEX.Item("CONNECTION_ID"), DR_AUTOINDEX.Item("SQL_PROVIDER"))
-    '                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Ergebnis SQL: '" & automatischerValue & "'", False)
+    '                    LOGGER.Debug("Ergebnis SQL: '" & automatischerValue & "'", False)
     '                    If automatischerValue <> String.Empty Then
     '                        DR_AUTOINDEX.Item("Indexiert") = True
     '                        DR_AUTOINDEX.Item("Indexwert") = automatischerValue
     '                    Else
-    '                        ClassLogger.Add(" - ACHTUNG: automatischerValue = String.Empty - Funktion: FillIndexe_Autom", False)
+    '                        Logger.Warn(" - ACHTUNG: automatischerValue = String.Empty - Funktion: FillIndexe_Autom", False)
-    '                        ClassLogger.Add(" - SqlString: " & SqlString, False)
+    '                        Logger.Warn(" - SqlString: " & SqlString, False)
     '                        Return False
     '                    End If
     '                Else
@@ -409,7 +409,7 @@ Public Class frmWM_IndexFile
     '                            Dim DEFAULTVALUE As String = DR_AUTOINDEX.Item("VALUE")
     '                            'Indexierung mit WindowsVariable
     '                            If DEFAULTVALUE.StartsWith("$") Then
-    '                                If LogErrorsOnly = False Then ClassLogger.Add(" >> Indexierung mit einer Windowsvariable: '" & DEFAULTVALUE & "'", False)
+    '                                LOGGER.Debug("Indexierung mit einer Windowsvariable: '" & DEFAULTVALUE & "'", False)
     '                                Select Case DEFAULTVALUE.ToUpper
     '                                    Case "$filename_ext".ToUpper
     '                                        DEFAULTVALUE = Path.GetFileName(CURRENT_WORKFILE)
@@ -428,9 +428,9 @@ Public Class frmWM_IndexFile
     '                                    Case "$DateDDMMYYY".ToUpper
     '                                        DEFAULTVALUE = System.DateTime.Now.ToShortDateString
     '                                End Select
-    '                                If LogErrorsOnly = False Then ClassLogger.Add(" >> Ergebnis der Windowsvariable: '" & DEFAULTVALUE & "'", False)
+    '                                LOGGER.Debug("Ergebnis der Windowsvariable: '" & DEFAULTVALUE & "'", False)
     '                            Else
-    '                                If LogErrorsOnly = False Then ClassLogger.Add(" >> Indexierung mit einem Festen Wert: '" & DEFAULTVALUE & "'", False)
+    '                                LOGGER.Debug("Indexierung mit einem Festen Wert: '" & DEFAULTVALUE & "'", False)
     '                            End If
     '                            'Den Wert in der Zwischentabelle speichern
     '                            DR_AUTOINDEX.Item("Indexiert") = True
@@ -445,7 +445,7 @@ Public Class frmWM_IndexFile
     '            Return True
     '        End If
     '    Catch ex As System.Exception
-    '        ClassLogger.Add(" - Fehler bei FillIndexe_Autom - Fehler: " & vbNewLine & ex.Message)
+    '        Logger.Warn(" - Fehler bei FillIndexe_Autom - Fehler: " & vbNewLine & ex.Message)
     '        MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei FillIndexe_Autom")
     '        Return False
     '    End Try
@@ -617,7 +617,7 @@ Public Class frmWM_IndexFile
                             AddDateTimePicker(DR.Item("GUID"), DR.Item("NAME"), y)
                         Case Else
                             MsgBox($"Please check the datatype of manual index ({ DR.Item("NAME")} - {type} - Refresh_Indices_Manual (frmWMIndexFile)", MsgBoxStyle.Critical, "Achtung:")
-                            ClassLogger.Add(" - Datentyp nicht hinterlegt - LoadIndexe_Man")
+                            LOGGER.Warn(" - Datentyp nicht hinterlegt - LoadIndexe_Man")
                     End Select
 
                     anz += 1
@@ -941,7 +941,7 @@ Public Class frmWM_IndexFile
                 Next
             End If
         Catch ex As Exception
-            ClassLogger.Add(" - Unvorhergesehener Unexpected error in Renew_ComboboxResults - Fehler: " & vbNewLine & ex.Message)
+            LOGGER.Warn(" - Unvorhergesehener Unexpected error in Renew_ComboboxResults - Fehler: " & vbNewLine & ex.Message)
             MsgBox(ex.Message, MsgBoxStyle.Critical, "Unvorhergesehener Unexpected error in Renew_ComboboxResults:")
         End Try
     End Sub
@@ -982,7 +982,7 @@ Public Class frmWM_IndexFile
                     End If
                 Else
                     runinLZ = True
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >>sql enthält Platzhalter und wird erst während der Laufzeit gefüllt!", False)
+                    LOGGER.Debug(" >>sql enthält Platzhalter und wird erst während der Laufzeit gefüllt!", False)
                 End If
 
 
@@ -1053,7 +1053,7 @@ Public Class frmWM_IndexFile
             End If
 
         Catch ex As Exception
-            ClassLogger.Add(" - Unvorhergesehener Unexpected error in AddVorschlag_ComboBox - Indexname: " & indexname & " - Fehler: " & vbNewLine & ex.Message)
+            LOGGER.Warn(" - Unvorhergesehener Unexpected error in AddVorschlag_ComboBox - Indexname: " & indexname & " - Fehler: " & vbNewLine & ex.Message)
             MsgBox(ex.Message, MsgBoxStyle.Critical, "Unvorhergesehener Unexpected error in AddVorschlag_ComboBox:")
         End Try
     End Sub
@@ -1135,7 +1135,7 @@ Public Class frmWM_IndexFile
             CURRENT_FILENAME = ""
             Me.VWDDINDEX_AUTOMTableAdapter.Connection.ConnectionString = MyConnectionString
             chkMultiIndexer.Checked = False
-            If LogErrorsOnly = False Then ClassLogger.Add(" >> frmWD_Index_Dokart_Load", False)
+            LOGGER.Debug("frmWD_Index_Dokart_Load", False)
             chkdelete_origin.Checked = False
             chkdelete_origin.Visible = False
             Dim HandleType As String
@@ -1195,7 +1195,7 @@ Public Class frmWM_IndexFile
                         MsgBox("No documenttypes for the redundant entity configured either! Indexing is not possible!" & vbNewLine & "Please check the configuration!", MsgBoxStyle.Exclamation)
                         Exit Sub
                     Else
-                        If LogErrorsOnly = False Then ClassLogger.Add(" >> Redundant EntityID: " & CURRENT_ENTITY_REDUNDANT_ID)
+                        LOGGER.Debug("Redundant EntityID: " & CURRENT_ENTITY_REDUNDANT_ID)
                         CURRENT_REDUNDANT_FORM_ID = CURRENT_ENTITY_REDUNDANT_ID
                         CURRENT_REDUNDANT_FORMVIEW_ID = FVID
                         CURRENT_ENTITY_ID = CURRENT_ENTITY_REDUNDANT_ID

app/DD-Record-Organizer/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NLog" version="4.7.10" targetFramework="net452" />
+</packages>

app/Setup_NoUpdaterVS19/Product.wxs

@@ -86,6 +86,10 @@
                   <File Id="DevExpress.XtraPrinting.v19.2_" Name="DevExpress.XtraPrinting.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraPrinting.v19.2.dll" />
                 </Component>
                 
+               <Component Id="NLog" Guid="{08903680-6b02-4ff0-b700-93209381fe1a}">
+                  <File Id="NLog" Name="NLog.dll" Source="NLog.dll" KeyPath="yes" Checksum="yes"/>
+                </Component>
+
               </Directory>
 
               <!--<Directory Id="VERSIONCHECKER" Name="VERSION_CHECKER">
@@ -143,7 +147,7 @@
               <File Id="DLLLicenseManager" Name="DLLLicenseManager.dll" Source="DLLLicenseManager.dll" KeyPath="no" />
               <File Id="DD_Rights" Name="DD_Rights.dll" Source="DD_Rights.dll" KeyPath="no" />
               <File Id="DD_LIB_Standards" Name="DD_LIB_Standards.dll" Source="DD_LIB_Standards.dll" KeyPath="no" />
-
+              <File Id="DDLogging" Name="DigitalData.Modules.Logging.dll" Source="DigitalData.Modules.Logging.dll" KeyPath="no" Checksum="yes"/>
             </Component>
             <!-- DD Bibliotheken -->
             <Component Id="BasicLibs" Guid="37238CB0-6DC3-4B1B-9438-52FA7D478897">
@@ -293,6 +297,7 @@
       <ComponentRef Id="Commandline" />
       <ComponentRef Id="ERPConnectLibs" />
       <ComponentRef Id="RecordOrganizer_RightManager"/>
+      <ComponentRef Id="NLog"/>
       <!--<ComponentRef Id="RecordOrganizer_VersionChecker" />-->
     </Feature>