Jobs: Version 1.3.0.6

GUIs.Test.ZUGFeRDTest/Form1.vb

@@ -89,6 +89,7 @@ Public Class Form1
         Dim args As New WorkerArgs()
         args = LoadFolderConfig(args)
         args = LoadPropertyMapFor(args, "DEFAULT")
+        args.InsertIntoSQLServer = True
 
         Dim job As New Jobs.ImportZUGFeRDFiles(_logConfig, _firebird, 1, _mssql)
 

GUIs.ZooFlow/Globix/frmGlobix_Index.vb

@@ -0,0 +1,217 @@
+Imports DigitalData.Modules.Logging
+
+
+Public Class frmGlobix_Index
+#Region "+++++ Variablen ++++++"
+        Public vPathFile As String
+        Private MULTIFILES As Integer
+        Private akttxtbox As TextBox
+        Dim DT_INDEXEMAN As DataTable
+        Dim DT_DOKART As DataTable
+        Public FormLoaded As Boolean = False
+        Dim DropType As String
+        Private Shared WDDirect As Boolean = False
+
+        Dim sql_history_INSERT_INTO As String
+        Dim sql_history_Index_Values As String
+
+        Private NewFileString As String
+        Private CancelAttempts As Integer = 0
+        Private Const MaxCancelAttempts = 2
+
+        Private Property ViewerString As String
+
+        Private Const TEXT_MISSING_INPUT = "Bitte vervollständigen Sie die Eingaben!"
+        Private _LogConfig As LogConfig
+        Private _Logger As Logger
+
+        Private clswindowLocation As ClassWindowLocation
+
+
+#End Region
+        Public Sub New(LogConfig As LogConfig)
+
+            ' Dieser Aufruf ist für den Designer erforderlich.
+            InitializeComponent()
+
+            ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
+            _Logger = LogConfig.GetLogger()
+            _LogConfig = LogConfig
+            clswindowLocation = New ClassWindowLocation(_LogConfig)
+        End Sub
+
+        Private Sub frmGlobix_Index_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+            ' Abbruchzähler zurücksetzen
+            CancelAttempts = 0
+
+            My.Application.Globix.INDEXING_ACTIVE = True
+
+            Try
+                My.Application.Globix.CURRENT_ISATTACHMENT = False
+                DropType = My.Database.GetScalarValue("SELECT HANDLE_TYPE FROM TBGI_FILES_USER WHERE GUID = " & My.Application.Globix.CURRENT_WORKFILE_GUID).ToString
+
+                My.Application.Globix.CURR_DELETE_ORIGIN = My.UIConfig.Globix.DeleteOriginalFile
+                SourceDeleteItem.Enabled = True
+                SourceDeleteItem.Checked = My.UIConfig.Globix.DeleteOriginalFile
+
+                My.Application.GDPictureLicense = My.Database.GetScalarValue("SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'")
+
+                DocumentViewer1.Init(_LogConfig, My.Application.GDPictureLicense)
+
+                If DropType Is Nothing Then
+                    _Logger.Debug("File with Id [{0}] was not found in TBGI_FILES_USER. Exiting.", My.Application.Globix.CURRENT_WORKFILE_GUID)
+                    CancelAttempts = MaxCancelAttempts
+                    Close()
+                Else
+                    My.Application.Globix.CURRENT_DROPTYPE = DropType.Replace("|", "")
+
+                    If DropType.StartsWith("|FW") Then
+                        ' Eine Datei aus FolderWatch wird IMMER gelöscht, egal wie die Einstellung in der Config lautet
+                        My.Application.Globix.CURR_DELETE_ORIGIN = True
+                        SourceDeleteItem.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
+                    ElseIf DropType.Contains("|OUTLOOK_MESSAGE|") Then
+                        ' Eine (DragDrop)-Outlook Nachricht wird NIE gelöscht, egal wie die Einstellung in der Config lautet
+                        My.Application.Globix.CURR_DELETE_ORIGIN = False
+                        SourceDeleteItem.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
+                    Else
+                        SourceDeleteItem.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
+                    End If
+
+                    If DropType = "|DROPFROMFSYSTEM|" Then
+                        If My.Application.User.Language <> "de-DE" Then
+                            Me.Text = "Indexing of dropped file"
+                        Else
+                            Me.Text = "Indexierung der gedroppten Datei"
+                        End If
+                    ElseIf DropType = "|OUTLOOK_MESSAGE|" Or DropType = "|FW_MSGONLY|" Then
+                        Select Case DropType
+                            Case "|FW_MSGONLY|"
+                                _Logger.Info(".msg-file from folderwatch")
+                                If My.Application.User.Language <> "de-DE" Then
+                                    Me.Text = "Indexing of msg-File (without Attachments) - from Folderwatch"
+                                Else
+                                    Me.Text = "Indexierung der msg-Datei (ohne Anhang) - aus Folderwatch"
+                                End If
+                            Case "|OUTLOOK_MESSAGE|"
+                                _Logger.Info(".msg-file through dragdrop")
+                                If My.Application.User.Language <> "de-DE" Then
+                                    Me.Text = "Indexing of msg-File (without Attachments)"
+                                Else
+                                    Me.Text = "Indexierung der msg-Datei (ohne Anhang)"
+                                End If
+                        End Select
+
+                    ElseIf DropType = "|MSGONLY|" Then
+                        If My.Application.User.Language = "de-DE" Then
+                            Me.Text = "Indexierung der msg-Datei (ohne Anhang)"
+                        Else
+                            Me.Text = "Indexing of msg-File (without Attachments)"
+                        End If
+                    ElseIf DropType = "|ATTMNTEXTRACTED|" Or DropType = "|OUTLOOK_ATTACHMENT|" Then
+                        My.Application.Globix.CURRENT_ISATTACHMENT = True
+
+                        If My.Application.User.Language = "de-DE" Then
+                            Me.Text = "Indexierung eines Email-Attachments"
+                        Else
+                            Me.Text = "Indexing of email-Attachment"
+                        End If
+                    ElseIf DropType = "|FW_SIMPLEINDEXER|" Then
+
+                        If My.Application.User.Language = "de-DE" Then
+                            Me.Text = "Indexierung einer Folderwatch-Datei"
+                        Else
+                            Me.Text = "Indexing of Folderwatch-File"
+                        End If
+                    End If
+
+                    labelFilePath.Caption = My.Application.Globix.CURRENT_WORKFILE
+
+                    clswindowLocation.LoadFormLocationSize(Me)
+
+                    SetFilePreview(My.UIConfig.Globix.FilePreview)
+
+                    SplitContainerControl1.SplitterPosition = My.UIConfig.Globix.SplitterDistanceViewer
+
+
+
+                    My.Application.Globix.DTTBGI_REGEX_DOCTYPE = My.Database.GetDatatable("SELECT DISTINCT T1.DOCTYPE as DocType, T.* FROM TBGI_REGEX_DOCTYPE T, VWGI_DOCTYPE T1 WHERE T.DOCTYPE_ID = T1.DOCTYPE_ID")
+                    MULTIFILES = My.Database.GetScalarValue("SELECT COUNT(*) FROM TBGI_FILES_USER WHERE WORKED = 0 AND GUID <> " & My.Application.Globix.CURRENT_WORKFILE_GUID & " AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')")
+                    My.Application.Globix.MULTIINDEXING_ACTIVE = False
+                    If MULTIFILES > 0 Then
+                        If My.Application.User.Language = "de-DE" Then
+                            RibbonPageGroupMultiIndex.Text = "Alle nachfolgenden Dateien (" & MULTIFILES & ") identisch indexieren"
+                        Else
+                            RibbonPageGroupMultiIndex.Text = "All following files (" & MULTIFILES & ") will be indexed identically"
+                        End If
+
+                        chkMultiindexing.Checked = False
+                        chkMultiindexing.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
+
+                    Else
+
+                        chkMultiindexing.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
+
+                    End If
+                End If
+
+
+            Catch ex As Exception
+                _Logger.Warn(" - Unexpected error in Öffnen des Formulares - Fehler: " & vbNewLine & ex.Message)
+                _Logger.Error(ex.Message)
+                MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error in Öffnen des Formulares:")
+            End Try
+        End Sub
+        Private Sub SetFilePreview(ShowPreview As Boolean)
+            If ShowPreview Then
+                SplitContainerControl1.Collapsed = False
+                PreviewFile()
+                PreviewItem.Checked = True
+            Else
+                SplitContainerControl1.Collapsed = True
+                PreviewItem.Checked = False
+            End If
+        End Sub
+        Sub PreviewFile()
+            Try
+                DocumentViewer1.LoadFile(My.Application.Globix.CURRENT_WORKFILE)
+            Catch ex As Exception
+                _Logger.Error(ex)
+                MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler in PreviewFile:")
+            End Try
+        End Sub
+
+        Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles SourceDeleteItem.ItemClick
+            If SourceDeleteItem.Visibility <> DevExpress.XtraBars.BarItemVisibility.Never Then
+                My.Application.Globix.CURR_DELETE_ORIGIN = SourceDeleteItem.Checked
+                My.UIConfig.Globix.DeleteOriginalFile = SourceDeleteItem.Checked
+                My.SystemConfigManager.Save()
+            End If
+        End Sub
+
+        Private Sub BarCheckItem5_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles PreviewItem.CheckedChanged
+
+        End Sub
+
+        Private Sub SourceDeleteItem_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles SourceDeleteItem.CheckedChanged
+
+        End Sub
+
+        Private Sub SaveProfileItem_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles SaveProfileItem.CheckedChanged
+            My.UIConfig.Globix.ProfilePreselection = SaveProfileItem.Checked
+            My.SystemConfigManager.Save()
+        End Sub
+
+        Private Sub SkipItem_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles SkipItem.ItemClick
+            My.Database.ExecuteNonQuery($"DELETE FROM TBGI_FILES_USER WHERE GUID = {My.Application.Globix.CURRENT_WORKFILE_GUID}")
+            CancelAttempts = 2
+            Close()
+        End Sub
+
+        Private Sub BarCheckItem3_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles chkMultiindexing.CheckedChanged
+            If chkMultiindexing.Checked Then
+                chkMultiindexing.Caption = "Active"
+            Else
+                chkMultiindexing.Caption = "Inactive"
+            End If
+        End Sub
+    End Class

GUIs.ZooFlow/Globix/frmGlobix_IndexFileList.Designer.vb

@@ -1,5 +1,5 @@
 <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class frmGlobixIndexFileList
+Partial Class frmGlobix_IndexFileList
     Inherits DevExpress.XtraBars.Ribbon.RibbonForm
 
     'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
@@ -22,7 +22,7 @@ Partial Class frmGlobixIndexFileList
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
-        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGlobixIndexFileList))
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGlobix_IndexFileList))
         Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
         Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
@@ -121,7 +121,7 @@ Partial Class frmGlobixIndexFileList
         Me.CheckedListBox1.Size = New System.Drawing.Size(617, 216)
         Me.CheckedListBox1.TabIndex = 2
         '
-        'frmGlobixIndexFileList
+        'frmGlobix_IndexFileList
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
@@ -129,9 +129,10 @@ Partial Class frmGlobixIndexFileList
         Me.Controls.Add(Me.CheckedListBox1)
         Me.Controls.Add(Me.RibbonStatusBar1)
         Me.Controls.Add(Me.RibbonControl1)
+        Me.IconOptions.SvgImage = CType(resources.GetObject("frmGlobix_IndexFileList.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.MaximizeBox = False
         Me.MinimizeBox = False
-        Me.Name = "frmGlobixIndexFileList"
+        Me.Name = "frmGlobix_IndexFileList"
         Me.Ribbon = Me.RibbonControl1
         Me.StatusBar = Me.RibbonStatusBar1
         Me.Text = "Zu indexierende Dateien:"

GUIs.ZooFlow/Globix/frmGlobix_IndexFileList.resx

@@ -201,6 +201,51 @@
         MC40LTAuNCwxLTAuNCwxLjQsMEwxNiwxNGw1LjctNS43YzAuNC0wLjQsMS0wLjQsMS40LDBsMC42LDAu
         NmMwLjQsMC40LDAuNCwxLDAsMS40TDE4LDE2TDIzLjcsMjEuN3oiIGNsYXNzPSJSZWQiIC8+DQogIDwv
         Zz4NCjwvc3ZnPgs=
+</value>
+  </data>
+  <data name="frmGlobix_IndexFileList.IconOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANYIAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGlzdE51bWJlcnMiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcg
+        MCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5SZWR7ZmlsbDojRDExQzFDO30K
+        CS5CbGFja3tmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8cGF0aCBkPSJNMzAsOEgxMlY2aDE4Vjh6
+        IE0zMCwxOEgxMnYtMmgxOFYxOHogTTMwLDI4SDEydi0yaDE4VjI4eiIgY2xhc3M9IkJsYWNrIiAvPg0K
+        ICA8cGF0aCBkPSJNNiwydjhINFY1LjNsLTIsMFYzLjdsMC4yLDBjMC4yLDAsMC41LDAsMC43LTAuMWMw
+        LjMsMCwwLjUtMC4xLDAuNy0wLjNjMC4yLTAuMSwwLjQtMC4zLDAuNS0wLjUgIGMwLjEtMC4yLDAuMi0w
+        LjQsMC4zLTAuN2wwLTAuMUg2eiBNOCwyMHYtMS42SDQuNkM0LjcsMTguMiw0LjksMTguMSw1LDE4YzAu
+        Mi0wLjIsMC41LTAuNCwwLjctMC41YzAuMy0wLjIsMC41LTAuMywwLjgtMC41ICBjMC4zLTAuMiwwLjUt
+        MC40LDAuNy0wLjZjMC4yLTAuMiwwLjQtMC41LDAuNS0wLjhjMC4xLTAuMywwLjItMC42LDAuMi0xYzAt
+        MC40LTAuMS0wLjctMC4yLTEuMWMtMC4xLTAuMy0wLjQtMC42LTAuNi0wLjggIGMtMC4zLTAuMi0wLjUt
+        MC40LTAuOS0wLjVjLTAuMy0wLjEtMC43LTAuMi0xLTAuMmMtMC41LDAtMC45LDAuMS0xLjMsMC4yYy0w
+        LjQsMC4yLTAuNywwLjQtMC45LDAuN2MtMC4yLDAuMy0wLjQsMC42LTAuNSwxICBjLTAuMSwwLjQtMC4y
+        LDAuOC0wLjIsMS4zbDAsMC4xaDEuOHYtMC4xYzAtMC4yLDAtMC40LDAuMS0wLjZjMC0wLjIsMC4xLTAu
+        NCwwLjItMC41YzAuMS0wLjEsMC4yLTAuMywwLjMtMC40ICBjMC4xLTAuMSwwLjMtMC4xLDAuNS0wLjFj
+        MC4zLDAsMC41LDAuMSwwLjcsMC4zYzAuMiwwLjIsMC4zLDAuNCwwLjMsMC44YzAsMC4yLDAsMC40LTAu
+        MSwwLjVjLTAuMSwwLjItMC4yLDAuMy0wLjQsMC41ICBjLTAuMSwwLjEtMC4zLDAuMy0wLjUsMC40Yy0w
+        LjIsMC4xLTAuNCwwLjItMC41LDAuNEM0LjMsMTYuNiw0LDE2LjgsMy43LDE3Yy0wLjMsMC4yLTAuNiww
+        LjUtMC44LDAuN2MtMC4yLDAuMy0wLjQsMC42LTAuNSwwLjkgIGMtMC4xLDAuMy0wLjIsMC43LTAuMiwx
+        LjJWMjBIOHogTTYuMSwyOS44YzAuMy0wLjEsMC43LTAuMywwLjktMC41YzAuMy0wLjIsMC41LTAuNSww
+        LjYtMC44QzcuOSwyOC4yLDgsMjcuOCw4LDI3LjQgIGMwLTAuNS0wLjEtMC45LTAuNC0xLjJjLTAuMi0w
+        LjItMC40LTAuNC0wLjctMC41YzAuMi0wLjEsMC40LTAuMywwLjUtMC41YzAuMi0wLjMsMC4zLTAuNiww
+        LjMtMWMwLTAuNC0wLjEtMC43LTAuMi0xICBjLTAuMi0wLjMtMC40LTAuNS0wLjYtMC43Yy0wLjItMC4y
+        LTAuNS0wLjMtMC44LTAuNEM1LjcsMjIsNS40LDIyLDUuMSwyMmMtMC40LDAtMC44LDAuMS0xLjEsMC4y
+        Yy0wLjMsMC4xLTAuNiwwLjMtMC45LDAuNiAgYy0wLjIsMC4yLTAuNCwwLjUtMC42LDAuOWMtMC4xLDAu
+        My0wLjIsMC43LTAuMiwxLjFsMCwwLjFoMS43bDAtMC4xYzAtMC4zLDAuMS0wLjYsMC4zLTAuOWMwLjIt
+        MC4yLDAuNC0wLjMsMC44LTAuMyAgYzAuMiwwLDAuNSwwLjEsMC42LDAuMkM1LjksMjMuOSw2LDI0LjEs
+        NiwyNC40YzAsMC4yLDAsMC4zLTAuMSwwLjRDNS44LDI0LjksNS42LDI1LDUuNSwyNWMtMC4xLDAuMS0w
+        LjMsMC4xLTAuNSwwLjEgIGMtMC4xLDAtMC4yLDAtMC4zLDBjLTAuMSwwLTAuMiwwLTAuMiwwbC0wLjIs
+        MHYxLjRoMC4xYzAuMiwwLDAuNCwwLDAuNiwwYzAuMiwwLDAuNCwwLDAuNSwwLjFjMC4xLDAuMSwwLjMs
+        MC4xLDAuNCwwLjMgIGMwLjEsMC4xLDAuMSwwLjMsMC4xLDAuNmMwLDAuMy0wLjEsMC42LTAuMywwLjdj
+        LTAuMiwwLjItMC41LDAuMy0wLjgsMC4zYy0wLjIsMC0wLjQsMC0wLjUtMC4xYy0wLjEtMC4xLTAuMy0w
+        LjItMC40LTAuMyAgQzQuMSwyOCw0LDI3LjgsNCwyNy43Yy0wLjEtMC4yLTAuMS0wLjMtMC4xLTAuNWww
+        LTAuMUgyLjJsMCwwLjFjMCwwLjQsMC4xLDAuOSwwLjIsMS4yYzAuMSwwLjQsMC4zLDAuNywwLjYsMC45
+        ICBjMC4zLDAuMiwwLjYsMC40LDAuOSwwLjZDNC4yLDI5LjksNC42LDMwLDUuMSwzMEM1LjQsMzAsNS44
+        LDI5LjksNi4xLDI5Ljh6IiBjbGFzcz0iUmVkIiAvPg0KPC9zdmc+Cw==
 </value>
   </data>
 </root>

GUIs.ZooFlow/Globix/frmGlobix_IndexFileList.vb

@@ -1,4 +1,4 @@
-Public Class frmGlobixIndexFileList
+Public Class frmGlobix_IndexFileList
     Private Sub frmGlobixIndexFileList_Load(sender As Object, e As EventArgs) Handles Me.Load
         Try
             Dim oSQL = $"Select * From TBGI_FILES_USER Where WORKED = 0 And (UPPER([USER@WORK]) = UPPER('{My.Application.User.UserName}'))"
@@ -13,4 +13,5 @@
             MsgBox("Unexpected error while loading data: " & ex.Message, vbCritical)
         End Try
     End Sub
-End Class
+End Class
+

GUIs.ZooFlow/ZooFlow.vbproj

@@ -133,16 +133,16 @@
     <Compile Include="frmFlowForm.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="frmGlobixIndexFileList.Designer.vb">
-      <DependentUpon>frmGlobixIndexFileList.vb</DependentUpon>
+    <Compile Include="Globix\frmGlobix_IndexFileList.Designer.vb">
+      <DependentUpon>frmGlobix_IndexFileList.vb</DependentUpon>
     </Compile>
-    <Compile Include="frmGlobixIndexFileList.vb">
+    <Compile Include="Globix\frmGlobix_IndexFileList.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="frmGlobix_Index.Designer.vb">
+    <Compile Include="Globix\frmGlobix_Index.Designer.vb">
       <DependentUpon>frmGlobix_Index.vb</DependentUpon>
     </Compile>
-    <Compile Include="frmGlobix_Index.vb">
+    <Compile Include="Globix\frmGlobix_Index.vb">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="frmSearchPredefined.Designer.vb">
@@ -204,10 +204,10 @@
     <EmbeddedResource Include="frmFlowForm.resx">
       <DependentUpon>frmFlowForm.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmGlobixIndexFileList.resx">
-      <DependentUpon>frmGlobixIndexFileList.vb</DependentUpon>
+    <EmbeddedResource Include="Globix\frmGlobix_IndexFileList.resx">
+      <DependentUpon>frmGlobix_IndexFileList.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmGlobix_Index.resx">
+    <EmbeddedResource Include="Globix\frmGlobix_Index.resx">
       <DependentUpon>frmGlobix_Index.vb</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="frmSearchPredefined.resx">

GUIs.ZooFlow/frmFlowForm.vb

@@ -338,7 +338,7 @@ Public Class frmFlowForm
             Next
 
             If My.Application.Globix.DTACTUAL_FILES.Rows.Count > 1 And oOnlyFilesFromFilesystem = False Then
-                frmGlobixIndexFileList.ShowDialog()
+                frmGlobix_IndexFileList.ShowDialog()
                 My.Application.Globix.DTACTUAL_FILES = Nothing
                 My.Application.Globix.DTACTUAL_FILES = My.Database.GetDatatable(sql)
             End If

GUIs.ZooFlow/frmGlobix_Index.vb

@@ -1,216 +0,0 @@
-Imports DigitalData.Modules.Logging
-
-Public Class frmGlobix_Index
-#Region "+++++ Variablen ++++++"
-    Public vPathFile As String
-    Private MULTIFILES As Integer
-    Private akttxtbox As TextBox
-    Dim DT_INDEXEMAN As DataTable
-    Dim DT_DOKART As DataTable
-    Public FormLoaded As Boolean = False
-    Dim DropType As String
-    Private Shared WDDirect As Boolean = False
-
-    Dim sql_history_INSERT_INTO As String
-    Dim sql_history_Index_Values As String
-
-    Private NewFileString As String
-    Private CancelAttempts As Integer = 0
-    Private Const MaxCancelAttempts = 2
-
-    Private Property ViewerString As String
-
-    Private Const TEXT_MISSING_INPUT = "Bitte vervollständigen Sie die Eingaben!"
-    Private _LogConfig As LogConfig
-    Private _Logger As Logger
-
-    Private clswindowLocation As ClassWindowLocation
-
-
-#End Region
-    Public Sub New(LogConfig As LogConfig)
-
-        ' Dieser Aufruf ist für den Designer erforderlich.
-        InitializeComponent()
-
-        ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
-        _Logger = LogConfig.GetLogger()
-        _LogConfig = LogConfig
-        clswindowLocation = New ClassWindowLocation(_LogConfig)
-    End Sub
-
-    Private Sub frmGlobix_Index_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-        ' Abbruchzähler zurücksetzen
-        CancelAttempts = 0
-
-        My.Application.Globix.INDEXING_ACTIVE = True
-
-        Try
-            My.Application.Globix.CURRENT_ISATTACHMENT = False
-            DropType = My.Database.GetScalarValue("SELECT HANDLE_TYPE FROM TBGI_FILES_USER WHERE GUID = " & My.Application.Globix.CURRENT_WORKFILE_GUID).ToString
-
-            My.Application.Globix.CURR_DELETE_ORIGIN = My.UIConfig.Globix.DeleteOriginalFile
-            SourceDeleteItem.Enabled = True
-            SourceDeleteItem.Checked = My.UIConfig.Globix.DeleteOriginalFile
-
-            My.Application.GDPictureLicense = My.Database.GetScalarValue("SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'")
-
-            DocumentViewer1.Init(_LogConfig, My.Application.GDPictureLicense)
-
-            If DropType Is Nothing Then
-                _Logger.Debug("File with Id [{0}] was not found in TBGI_FILES_USER. Exiting.", My.Application.Globix.CURRENT_WORKFILE_GUID)
-                CancelAttempts = MaxCancelAttempts
-                Close()
-            Else
-                My.Application.Globix.CURRENT_DROPTYPE = DropType.Replace("|", "")
-
-                If DropType.StartsWith("|FW") Then
-                    ' Eine Datei aus FolderWatch wird IMMER gelöscht, egal wie die Einstellung in der Config lautet
-                    My.Application.Globix.CURR_DELETE_ORIGIN = True
-                    SourceDeleteItem.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
-                ElseIf DropType.Contains("|OUTLOOK_MESSAGE|") Then
-                    ' Eine (DragDrop)-Outlook Nachricht wird NIE gelöscht, egal wie die Einstellung in der Config lautet
-                    My.Application.Globix.CURR_DELETE_ORIGIN = False
-                    SourceDeleteItem.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
-                Else
-                    SourceDeleteItem.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
-                End If
-
-                If DropType = "|DROPFROMFSYSTEM|" Then
-                    If My.Application.User.Language <> "de-DE" Then
-                        Me.Text = "Indexing of dropped file"
-                    Else
-                        Me.Text = "Indexierung der gedroppten Datei"
-                    End If
-                ElseIf DropType = "|OUTLOOK_MESSAGE|" Or DropType = "|FW_MSGONLY|" Then
-                    Select Case DropType
-                        Case "|FW_MSGONLY|"
-                            _Logger.Info(".msg-file from folderwatch")
-                            If My.Application.User.Language <> "de-DE" Then
-                                Me.Text = "Indexing of msg-File (without Attachments) - from Folderwatch"
-                            Else
-                                Me.Text = "Indexierung der msg-Datei (ohne Anhang) - aus Folderwatch"
-                            End If
-                        Case "|OUTLOOK_MESSAGE|"
-                            _Logger.Info(".msg-file through dragdrop")
-                            If My.Application.User.Language <> "de-DE" Then
-                                Me.Text = "Indexing of msg-File (without Attachments)"
-                            Else
-                                Me.Text = "Indexierung der msg-Datei (ohne Anhang)"
-                            End If
-                    End Select
-
-                ElseIf DropType = "|MSGONLY|" Then
-                    If My.Application.User.Language = "de-DE" Then
-                        Me.Text = "Indexierung der msg-Datei (ohne Anhang)"
-                    Else
-                        Me.Text = "Indexing of msg-File (without Attachments)"
-                    End If
-                ElseIf DropType = "|ATTMNTEXTRACTED|" Or DropType = "|OUTLOOK_ATTACHMENT|" Then
-                    My.Application.Globix.CURRENT_ISATTACHMENT = True
-
-                    If My.Application.User.Language = "de-DE" Then
-                        Me.Text = "Indexierung eines Email-Attachments"
-                    Else
-                        Me.Text = "Indexing of email-Attachment"
-                    End If
-                ElseIf DropType = "|FW_SIMPLEINDEXER|" Then
-
-                    If My.Application.User.Language = "de-DE" Then
-                        Me.Text = "Indexierung einer Folderwatch-Datei"
-                    Else
-                        Me.Text = "Indexing of Folderwatch-File"
-                    End If
-                End If
-
-                labelFilePath.Caption = My.Application.Globix.CURRENT_WORKFILE
-
-                clswindowLocation.LoadFormLocationSize(Me)
-
-                SetFilePreview(My.UIConfig.Globix.FilePreview)
-
-                SplitContainerControl1.SplitterPosition = My.UIConfig.Globix.SplitterDistanceViewer
-
-
-
-                My.Application.Globix.DTTBGI_REGEX_DOCTYPE = My.Database.GetDatatable("SELECT DISTINCT T1.DOCTYPE as DocType, T.* FROM TBGI_REGEX_DOCTYPE T, VWGI_DOCTYPE T1 WHERE T.DOCTYPE_ID = T1.DOCTYPE_ID")
-                MULTIFILES = My.Database.GetScalarValue("SELECT COUNT(*) FROM TBGI_FILES_USER WHERE WORKED = 0 AND GUID <> " & My.Application.Globix.CURRENT_WORKFILE_GUID & " AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')")
-                My.Application.Globix.MULTIINDEXING_ACTIVE = False
-                If MULTIFILES > 0 Then
-                    If My.Application.User.Language = "de-DE" Then
-                        RibbonPageGroupMultiIndex.Text = "Alle nachfolgenden Dateien (" & MULTIFILES & ") identisch indexieren"
-                    Else
-                        RibbonPageGroupMultiIndex.Text = "All following files (" & MULTIFILES & ") will be indexed identically"
-                    End If
-
-                    chkMultiindexing.Checked = False
-                    chkMultiindexing.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
-
-                Else
-
-                    chkMultiindexing.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
-
-                End If
-            End If
-
-
-        Catch ex As Exception
-            _Logger.Warn(" - Unexpected error in Öffnen des Formulares - Fehler: " & vbNewLine & ex.Message)
-            _Logger.Error(ex.Message)
-            MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error in Öffnen des Formulares:")
-        End Try
-    End Sub
-    Private Sub SetFilePreview(ShowPreview As Boolean)
-        If ShowPreview Then
-            SplitContainerControl1.Collapsed = False
-            PreviewFile()
-            PreviewItem.Checked = True
-        Else
-            SplitContainerControl1.Collapsed = True
-            PreviewItem.Checked = False
-        End If
-    End Sub
-    Sub PreviewFile()
-        Try
-            DocumentViewer1.LoadFile(My.Application.Globix.CURRENT_WORKFILE)
-        Catch ex As Exception
-            _Logger.Error(ex)
-            MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler in PreviewFile:")
-        End Try
-    End Sub
-
-    Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles SourceDeleteItem.ItemClick
-        If SourceDeleteItem.Visibility <> DevExpress.XtraBars.BarItemVisibility.Never Then
-            My.Application.Globix.CURR_DELETE_ORIGIN = SourceDeleteItem.Checked
-            My.UIConfig.Globix.DeleteOriginalFile = SourceDeleteItem.Checked
-            My.SystemConfigManager.Save()
-        End If
-    End Sub
-
-    Private Sub BarCheckItem5_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles PreviewItem.CheckedChanged
-
-    End Sub
-
-    Private Sub SourceDeleteItem_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles SourceDeleteItem.CheckedChanged
-
-    End Sub
-
-    Private Sub SaveProfileItem_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles SaveProfileItem.CheckedChanged
-        My.UIConfig.Globix.ProfilePreselection = SaveProfileItem.Checked
-        My.SystemConfigManager.Save()
-    End Sub
-
-    Private Sub SkipItem_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles SkipItem.ItemClick
-        My.Database.ExecuteNonQuery($"DELETE FROM TBGI_FILES_USER WHERE GUID = {My.Application.Globix.CURRENT_WORKFILE_GUID}")
-        CancelAttempts = 2
-        Close()
-    End Sub
-
-    Private Sub BarCheckItem3_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles chkMultiindexing.CheckedChanged
-        If chkMultiindexing.Checked Then
-            chkMultiindexing.Caption = "Active"
-        Else
-            chkMultiindexing.Caption = "Inactive"
-        End If
-    End Sub
-End Class

Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb

@@ -63,14 +63,26 @@ Public Class ImportZUGFeRDFiles
     Private Function MoveAndRenameEmailToRejected(Args As WorkerArgs, MessageId As String) As EmailData
         Dim oEmailData = _email.GetEmailDataForMessageId(MessageId)
         Dim oSource = _email.GetOriginalEmailPath(Args.OriginalEmailDirectory, MessageId)
+        Dim oDateSubDirectoryName As String = Now.ToString("yyyy-MM-dd")
         Dim oDestination As String
 
+        Dim oRejectedDirectory As String = Path.Combine(Args.RejectedEmailDirectory, oDateSubDirectoryName)
+
+        ' Create the destination directory if it does not exist
+        If Not Directory.Exists(oRejectedDirectory) Then
+            Try
+                Directory.CreateDirectory(oRejectedDirectory)
+            Catch ex As Exception
+                _logger.Error(ex)
+            End Try
+        End If
+
         ' If oEmailData is Nothing, TBEDM_EMAIL_PROFILER_HISTORY for MessageId was not found. 
         ' This only should happen when testing and db-tables are deleted frequently
         If oEmailData Is Nothing Then
-            oDestination = _email.GetEmailPathWithSubjectAsName(Args.RejectedEmailDirectory, MessageId)
+            oDestination = _email.GetEmailPathWithSubjectAsName(oRejectedDirectory, MessageId)
         Else
-            oDestination = _email.GetEmailPathWithSubjectAsName(Args.RejectedEmailDirectory, oEmailData.Subject)
+            oDestination = _email.GetEmailPathWithSubjectAsName(oRejectedDirectory, oEmailData.Subject)
         End If
 
         _logger.Debug("Destination for eml file is {0}", oDestination)
@@ -151,6 +163,10 @@ Public Class ImportZUGFeRDFiles
                         Dim oZUGFeRDCount As Integer = 0
                         ' Set the default Move Directory
                         Dim oMoveDirectory As String = oArgs.SuccessDirectory
+                        ' Flag to save if the whole process was a success.
+                        ' Will be set only at the end of the function if no error occurred.
+                        Dim oIsSuccess As Boolean = False
+
                         ' Create file lists
                         Dim oFileGroupFiles As List(Of FileInfo) = oFileGroup.Value
                         Dim oEmailAttachmentFiles As New List(Of FileInfo)
@@ -478,6 +494,8 @@ Public Class ImportZUGFeRDFiles
                                 End Try
                             End If
 
+                            oIsSuccess = True
+
                         Catch ex As MD5HashException
                             _logger.Error(ex)
                             oMoveDirectory = oArgs.ErrorDirectory
@@ -546,7 +564,7 @@ Public Class ImportZUGFeRDFiles
 
                             ' Move all files of the current group
                             Try
-                                MoveFiles(oArgs, oMessageId, oFileGroupFiles, oEmailAttachmentFiles, oEmbeddedAttachmentFiles, oMoveDirectory)
+                                MoveFiles(oArgs, oMessageId, oFileGroupFiles, oEmailAttachmentFiles, oEmbeddedAttachmentFiles, oMoveDirectory, oIsSuccess)
                                 _logger.Info("Finished processing file group {0}", oMessageId)
                             Catch ex As Exception
                                 _logger.Warn("Could not move files!")
@@ -567,9 +585,23 @@ Public Class ImportZUGFeRDFiles
         End Try
     End Sub
 
-    Private Sub MoveFiles(Args As WorkerArgs, MessageId As String, Files As List(Of FileInfo), AttachmentFiles As List(Of FileInfo), EmbeddedAttachments As List(Of PDFAttachments.AttachmentResult), MoveDirectory As String)
+    Private Sub MoveFiles(
+                         Args As WorkerArgs,
+                         MessageId As String,
+                         Files As List(Of FileInfo),
+                         AttachmentFiles As List(Of FileInfo),
+                         EmbeddedAttachments As List(Of PDFAttachments.AttachmentResult),
+                         MoveDirectory As String,
+                         IsSuccess As Boolean)
+
         Dim oFinalMoveDirectory As String = MoveDirectory
-        Dim oAttachmentDirectory As String = Path.Combine(MoveDirectory, Args.AttachmentsSubDirectory)
+        Dim oDateSubDirectoryName As String = Now.ToString("yyyy-MM-dd")
+        Dim oAttachmentDirectory As String = Path.Combine(MoveDirectory, Args.AttachmentsSubDirectory, oDateSubDirectoryName)
+
+        ' Files will be moved to a subfolder for the current day if they are rejected
+        If Not IsSuccess Then
+            oFinalMoveDirectory = Path.Combine(oFinalMoveDirectory, oDateSubDirectoryName)
+        End If
 
         ' Create directories if they don't exist
         If Not Directory.Exists(oFinalMoveDirectory) Then

Modules.Jobs/My Project/AssemblyInfo.vb

@@ -30,5 +30,5 @@ Imports System.Runtime.InteropServices
 ' Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 ' übernehmen, indem Sie "*" eingeben:
 
-<Assembly: AssemblyVersion("1.3.0.5")>
-<Assembly: AssemblyFileVersion("1.3.0.5")>
+<Assembly: AssemblyVersion("1.3.0.6")>
+<Assembly: AssemblyFileVersion("1.3.0.6")>

Modules.Logging/My Project/AssemblyInfo.vb

@@ -32,4 +32,4 @@ Imports System.Runtime.InteropServices
 ' <Assembly: AssemblyVersion("1.0.*")>
 
 <Assembly: AssemblyVersion("2.0.2.0")>
-<Assembly: AssemblyFileVersion("1.0.0.0")>
+<Assembly: AssemblyFileVersion("2.0.2.0")>