Logging und Vorbereitung MAPPING wie in taskFLOW

2026-05-04 16:40:14 +02:00
parent b586bf496b
commit 734e056248
15 changed files with 303 additions and 268 deletions
--- a/Controls.DocumentViewer/DocumentViewer.Designer.vb
+++ b/Controls.DocumentViewer/DocumentViewer.Designer.vb
@@ -64,6 +64,7 @@ Partial Class DocumentViewer
        Me.lbFileNotLoaded = New DevExpress.XtraEditors.LabelControl()
        Me.RichEditControl1 = New DevExpress.XtraRichEdit.RichEditControl()
        Me.lblInfo = New System.Windows.Forms.Label()
+        Me.GdViewer = New GdPicture14.GdViewer()
        CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.RepositoryItemTextEdit2, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.RepositoryItemTextEdit3, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -346,7 +347,7 @@ Partial Class DocumentViewer
        '
        'SpreadsheetControl1
        '
-        Me.SpreadsheetControl1.Location = New System.Drawing.Point(83, 177)
+        Me.SpreadsheetControl1.Location = New System.Drawing.Point(59, 181)
        Me.SpreadsheetControl1.MenuManager = Me.BarManager1
        Me.SpreadsheetControl1.Name = "SpreadsheetControl1"
        Me.SpreadsheetControl1.ReadOnly = True
@@ -377,13 +378,94 @@ Partial Class DocumentViewer
        '
        'RichEditControl1
        '
-        Me.RichEditControl1.Location = New System.Drawing.Point(571, 238)
+        Me.RichEditControl1.Location = New System.Drawing.Point(385, 166)
        Me.RichEditControl1.MenuManager = Me.BarManager1
        Me.RichEditControl1.Name = "RichEditControl1"
        Me.RichEditControl1.Size = New System.Drawing.Size(400, 200)
        Me.RichEditControl1.TabIndex = 5
        Me.RichEditControl1.Visible = False
        '
+        'lblInfo
+        '
+        Me.lblInfo.Location = New System.Drawing.Point(0, 0)
+        Me.lblInfo.Name = "lblInfo"
+        Me.lblInfo.Size = New System.Drawing.Size(100, 23)
+        Me.lblInfo.TabIndex = 0
+        '
+        'GdViewer
+        '
+        Me.GdViewer.AllowDropFile = False
+        Me.GdViewer.AnimateGIF = True
+        Me.GdViewer.AnnotationDropShadow = True
+        Me.GdViewer.AnnotationEnableMultiSelect = True
+        Me.GdViewer.AnnotationResizeRotateHandlesColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.GdViewer.AnnotationResizeRotateHandlesScale = 1.0!
+        Me.GdViewer.AnnotationSelectionLineColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
+        Me.GdViewer.AutoScrollMargin = New System.Drawing.Size(0, 0)
+        Me.GdViewer.AutoScrollMinSize = New System.Drawing.Size(0, 0)
+        Me.GdViewer.BackColor = System.Drawing.Color.Black
+        Me.GdViewer.BackgroundImage = Nothing
+        Me.GdViewer.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
+        Me.GdViewer.ClipAnnotsToPageBounds = True
+        Me.GdViewer.ClipRegionsToPageBounds = True
+        Me.GdViewer.ContinuousViewMode = True
+        Me.GdViewer.DisplayQuality = GdPicture14.DisplayQuality.DisplayQualityAutomatic
+        Me.GdViewer.DisplayQualityAuto = True
+        Me.GdViewer.DocumentAlignment = GdPicture14.ViewerDocumentAlignment.DocumentAlignmentMiddleCenter
+        Me.GdViewer.DocumentPosition = GdPicture14.ViewerDocumentPosition.DocumentPositionMiddleCenter
+        Me.GdViewer.DrawPageBorders = True
+        Me.GdViewer.EnableDeferredPainting = True
+        Me.GdViewer.EnabledProgressBar = True
+        Me.GdViewer.EnableFuzzySearch = False
+        Me.GdViewer.EnableICM = False
+        Me.GdViewer.EnableMenu = True
+        Me.GdViewer.EnableMouseWheel = True
+        Me.GdViewer.EnableTextSelection = True
+        Me.GdViewer.ForceScrollBars = False
+        Me.GdViewer.ForceTemporaryMode = False
+        Me.GdViewer.ForeColor = System.Drawing.Color.Black
+        Me.GdViewer.Gamma = 1.0!
+        Me.GdViewer.HQAnnotationRendering = True
+        Me.GdViewer.IgnoreDocumentResolution = False
+        Me.GdViewer.KeepDocumentPosition = False
+        Me.GdViewer.Location = New System.Drawing.Point(290, 372)
+        Me.GdViewer.LockViewer = False
+        Me.GdViewer.MagnifierHeight = 90
+        Me.GdViewer.MagnifierWidth = 160
+        Me.GdViewer.MagnifierZoomX = 2.0!
+        Me.GdViewer.MagnifierZoomY = 2.0!
+        Me.GdViewer.MouseButtonForMouseMode = GdPicture14.MouseButton.MouseButtonLeft
+        Me.GdViewer.MouseMode = GdPicture14.ViewerMouseMode.MouseModePan
+        Me.GdViewer.MouseWheelMode = GdPicture14.ViewerMouseWheelMode.MouseWheelModeZoom
+        Me.GdViewer.Name = "GdViewer"
+        Me.GdViewer.PageBordersColor = System.Drawing.Color.Black
+        Me.GdViewer.PageBordersPenSize = 1
+        Me.GdViewer.PageDisplayMode = GdPicture14.PageDisplayMode.MultiplePagesView
+        Me.GdViewer.PdfDisplayFormField = True
+        Me.GdViewer.PdfEnableFileLinks = True
+        Me.GdViewer.PdfEnableLinks = True
+        Me.GdViewer.PdfIncreaseTextContrast = False
+        Me.GdViewer.PdfShowDialogForPassword = True
+        Me.GdViewer.PdfShowOpenFileDialogForDecryption = True
+        Me.GdViewer.PdfVerifyDigitalCertificates = False
+        Me.GdViewer.PreserveViewRotation = True
+        Me.GdViewer.RectBorderColor = System.Drawing.Color.Black
+        Me.GdViewer.RectBorderSize = 1
+        Me.GdViewer.RectIsEditable = True
+        Me.GdViewer.RegionsAreEditable = True
+        Me.GdViewer.RenderGdPictureAnnots = True
+        Me.GdViewer.ScrollBars = True
+        Me.GdViewer.ScrollLargeChange = CType(50, Short)
+        Me.GdViewer.ScrollSmallChange = CType(1, Short)
+        Me.GdViewer.SilentMode = True
+        Me.GdViewer.Size = New System.Drawing.Size(128, 128)
+        Me.GdViewer.TabIndex = 0
+        Me.GdViewer.ViewRotation = System.Drawing.RotateFlipType.RotateNoneFlipNone
+        Me.GdViewer.Zoom = 1.0R
+        Me.GdViewer.ZoomCenterAtMousePosition = False
+        Me.GdViewer.ZoomMode = GdPicture14.ViewerZoomMode.ZoomMode100
+        Me.GdViewer.ZoomStep = 25
+        '
        'DocumentViewer
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
--- a/Controls.DocumentViewer/DocumentViewer.resx
+++ b/Controls.DocumentViewer/DocumentViewer.resx
@@ -123,9 +123,6 @@
  <metadata name="BarManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>285, 22</value>
  </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>25</value>
-  </metadata>
  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
  <data name="buttonPrint.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
@@ -222,6 +219,9 @@
        OCw4TDE2LDI0eiIgY2xhc3M9IkdyZWVuIiAvPg0KICA8L2c+DQo8L3N2Zz4L
 </value>
  </data>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>25</value>
+  </metadata>
  <data name="btnSearch.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
--- a/Controls.DocumentViewer/DocumentViewer.vb
+++ b/Controls.DocumentViewer/DocumentViewer.vb
@@ -596,111 +596,9 @@ Public Class DocumentViewer
            Return False
        End Try
    End Function
-    Private Function DoLoadFile(FilePath As String) As Boolean
-        Try
-            ' Ensure the embedded GdViewer control exists before using it
-            If Not EnsureViewerReady() Then
-                _logger?.Warn("GdViewer control is not initialized yet. Delaying load.")
-                Return False
-            End If

-            lblInfo.Visible = False
-            Dim oFileInfo = New FileInfo(FilePath)
-            Dim oExtension As String = oFileInfo.Extension.ToUpper
-
-            lbFileNotLoaded.Visible = False
-
-            SpreadsheetControl1.Visible = False
-            RichEditControl1.Visible = False
-
-            SpreadsheetControl1.Dock = DockStyle.None
-            RichEditControl1.Dock = DockStyle.None
-            Dim Override_SSheet_Filesize As Boolean = False
-            If oExtension.ToLower = ".xlsx" Then
-                If oFileInfo.Length > 100000 Then
-                    _logger.Info("Override Spreadsheet as xlsx is too big")
-                    Override_SSheet_Filesize = True
-                End If
-            End If
-            If Override_SSheet_Filesize Then
-                Dim oFormat = GetSpreadsheetFormat(oExtension)
-                SpreadsheetControl1.LoadDocument(FilePath, oFormat)
-
-                Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange()
-                oRange.AutoFitColumns()
-
-                If ViewOverride = "Richtext" Then
-                    RichEditControl1.LoadDocument(FilePath, GetDocumentFormat(oExtension))
-                    RichEditControl1.Visible = True
-                    GdViewer.Visible = False
-                    RichEditControl1.Dock = DockStyle.Fill
-                    _ViewOverride = "Richtext"
-                    _ViewerMode = ViewerMode.Richtext
-                    lblInfo.Visible = True
-                    lblInfo.Text = "This docx-file contains a generic error and will be displayed in a reduced viewer. Please try to open the file in WORD"
-                Else
-                    _ViewOverride = ""
-                    Select Case oExtension.ToUpper
-                        Case ".CSV"
-                            Dim oFormat = GetSpreadsheetFormat(oExtension)
-                            SpreadsheetControl1.LoadDocument(FilePath, oFormat)
-
-                            Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange()
-                        oRange.AutoFitColumns()
-
-                        SpreadsheetControl1.Visible = True
-                        GdViewer.Visible = False
-                        SpreadsheetControl1.Dock = DockStyle.Fill
-                        Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT"
-                            RichEditControl1.LoadDocument(FilePath, GetDocumentFormat(oExtension))
-
-                            RichEditControl1.Visible = True
-                            GdViewer.Visible = False
-                            RichEditControl1.Dock = DockStyle.Fill
-                        Case Else
-                        GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
-                        GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
-                        GdViewer.ForceTemporaryMode = True
-                            GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
-                            If Viewer_ForceTemporaryMode = True Then
-                                GdViewer.ForceTemporaryMode = True
-                            End If
-
-                            GdViewer.AnnotationDropShadow = True
-                            GdViewer.BackColor = Color.White
-
-                            Dim oGDPState As GdPicture14.GdPictureStatus = GdViewer.DisplayFromFile(FilePath)
-                            If oGDPState <> GdPictureStatus.OK Then
-                                _logger.Warn($"GdPictureStatus is [{oGDPState}]")
-                                If oExtension.ToUpper = ".DOCX" And oGDPState = GdPictureStatus.GenericError Then
-                                    DoLoadFile(FilePath, "Richtext")
-                                Else
-                                    Dim oFileName = IO.Path.GetFileName(FilePath)
-                                    lbFileNotLoaded.Text = String.Format("Datei konnte nicht geladen werden:{0}{1}", vbCrLf, oFileName)
-                                lbFileNotLoaded.Visible = True
-                            End If
-
-                        Else
-                            If GdViewer.Visible = False Then
-                                GdViewer.Visible = True
-                            End If
-                        End If
-
-                End Select
-
-
-                Return True
-        Catch ex As Exception
-            _logger.Error(ex)
-            Return False
-        End Try
-    End Function

    ' Ensures the embedded GdViewer control exists and is added to the visual tree
-    Private Function EnsureViewerReady() As Boolean
-        Try
-            ' If the control field is Nothing (e.g., designer not yet created), try to lazy-create and add it
-            If GdViewer Is Nothing Then
    Private Function EnsureViewerReady() As Boolean
        Try
            ' If the control field is Nothing (e.g., designer not yet created), try to lazy-create and add it