report & service fixes

EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj

@@ -56,8 +56,11 @@
     <Reference Include="DevExpress.RichEdit.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.RichEdit.v21.2.Export, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Sparkline.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.Xpo.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraCharts.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.XtraGauges.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraReports.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DigitalData.Modules.Base, Version=1.3.4.0, Culture=neutral, processorArchitecture=MSIL">

EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb

@@ -111,6 +111,12 @@ Namespace Jobs
                         Throw New ApplicationException("Document could not be finalized")
                     End If
 
+                    Logger.Debug("Setting envelope status..")
+                    If ActionService.FinalizeEnvelope(oEnvelope) = False Then
+                        Logger.Warn("Envelope could not be finalized!")
+                        Throw New ApplicationException("Envelope could not be finalized")
+                    End If
+
                     Logger.Debug("Creating report..")
                     Dim oReport As Byte() = ReportCreator.CreateReport(oEnvelope)
 
@@ -126,16 +132,10 @@ Namespace Jobs
                     Try
                         File.WriteAllBytes(oOutputFilePath, oMergedDocument)
                     Catch ex As Exception
+                        Logger.Warn("Could not export final document to disk!")
                         Throw New ExportDocumentException("Could not export final document to disk!", ex)
-                        Logger.Error(ex)
                     End Try
 
-                    Logger.Debug("Setting envelope status..")
-                    If ActionService.FinalizeEnvelope(oEnvelope) = False Then
-                        Logger.Warn("Envelope could not be finalized!")
-                        Throw New ApplicationException("Envelope could not be finalized")
-                    End If
-
                     oCurrent += 1
                     Logger.Info("Envelope finalized!")
 
@@ -149,9 +149,11 @@ Namespace Jobs
             Catch ex As Exception
                 Logger.Warn("Certificate Document job failed!")
                 Logger.Error(ex)
+            Finally
+                Logger.Info("Job execution for [{0}] ended", JobId)
             End Try
 
-            Logger.Info("Job execution for [{0}] ended", JobId)
+            Return Task.FromResult(True)
         End Function
 
         Private Function MergeDocuments(pDocument As Byte(), pReport As Byte()) As Byte()

EnvelopeGenerator.Common/Jobs/FinalizeDocument/ReportItem.vb

@@ -1,4 +1,6 @@
-Public Class ReportItem
+Imports System.Windows.Forms.VisualStyles.VisualStyleElement
+
+Public Class ReportItem
 
     Public Property Envelope As Envelope
     Public Property EnvelopeId As Integer
@@ -6,6 +8,13 @@
     Public Property EnvelopeSubject As String
 
     Public Property ItemStatus As Constants.EnvelopeStatus
+    Public ReadOnly Property ItemStatusTranslated As String
+        Get
+            Dim oStatus = ItemStatus.ToString()
+            Return My.Resources.Model.ResourceManager.GetString(oStatus)
+        End Get
+    End Property
+
     Public Property ItemUserReference As String
     Public Property ItemDate As Date
 

EnvelopeGenerator.Common/Reports/rptEnvelopeHistory.Designer.vb

@@ -20,8 +20,10 @@ Partial Public Class rptEnvelopeHistory
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(rptEnvelopeHistory))
         Me.TopMargin = New DevExpress.XtraReports.UI.TopMarginBand()
         Me.BottomMargin = New DevExpress.XtraReports.UI.BottomMarginBand()
+        Me.XrLabel1 = New DevExpress.XtraReports.UI.XRLabel()
         Me.pageInfo1 = New DevExpress.XtraReports.UI.XRPageInfo()
         Me.pageInfo2 = New DevExpress.XtraReports.UI.XRPageInfo()
         Me.ReportHeader = New DevExpress.XtraReports.UI.ReportHeaderBand()
@@ -43,19 +45,38 @@ Partial Public Class rptEnvelopeHistory
         Me.DetailData1 = New DevExpress.XtraReports.UI.XRControlStyle()
         Me.DetailData3_Odd = New DevExpress.XtraReports.UI.XRControlStyle()
         Me.PageInfo = New DevExpress.XtraReports.UI.XRControlStyle()
-        Me.XrLabel2 = New DevExpress.XtraReports.UI.XRLabel()
-        Me.XrLabel3 = New DevExpress.XtraReports.UI.XRLabel()
+        Me.XrTable3 = New DevExpress.XtraReports.UI.XRTable()
+        Me.XrTableRow8 = New DevExpress.XtraReports.UI.XRTableRow()
+        Me.XrTableCell13 = New DevExpress.XtraReports.UI.XRTableCell()
+        Me.XrTableCell15 = New DevExpress.XtraReports.UI.XRTableCell()
+        Me.XrTableRow9 = New DevExpress.XtraReports.UI.XRTableRow()
+        Me.XrTableCell14 = New DevExpress.XtraReports.UI.XRTableCell()
+        Me.XrTableCell16 = New DevExpress.XtraReports.UI.XRTableCell()
+        Me.XrTableCell17 = New DevExpress.XtraReports.UI.XRTableCell()
+        Me.XrTableCell18 = New DevExpress.XtraReports.UI.XRTableCell()
+        Me.XrTableRow10 = New DevExpress.XtraReports.UI.XRTableRow()
+        Me.XrTableCell19 = New DevExpress.XtraReports.UI.XRTableCell()
+        Me.XrTableCell20 = New DevExpress.XtraReports.UI.XRTableCell()
+        Me.XrTableCell21 = New DevExpress.XtraReports.UI.XRTableCell()
+        Me.XrTableCell22 = New DevExpress.XtraReports.UI.XRTableCell()
+        Me.XrTableRow11 = New DevExpress.XtraReports.UI.XRTableRow()
+        Me.XrTableCell23 = New DevExpress.XtraReports.UI.XRTableCell()
+        Me.XrTableCell24 = New DevExpress.XtraReports.UI.XRTableCell()
+        Me.XrTableCell25 = New DevExpress.XtraReports.UI.XRTableCell()
+        Me.XrTableCell26 = New DevExpress.XtraReports.UI.XRTableCell()
+        Me.GalleryDropDown1 = New DevExpress.XtraBars.Ribbon.GalleryDropDown(Me.components)
         Me.ObjectDataSource1 = New DevExpress.DataAccess.ObjectBinding.ObjectDataSource(Me.components)
-        Me.XrLabel4 = New DevExpress.XtraReports.UI.XRLabel()
-        Me.XrLabel1 = New DevExpress.XtraReports.UI.XRLabel()
         CType(Me.table1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.table2, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.XrTable3, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.GalleryDropDown1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.ObjectDataSource1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me, System.ComponentModel.ISupportInitialize).BeginInit()
         '
         'TopMargin
         '
         Me.TopMargin.Dpi = 254.0!
+        Me.TopMargin.HeightF = 190.6042!
         Me.TopMargin.Name = "TopMargin"
         '
         'BottomMargin
@@ -64,40 +85,78 @@ Partial Public Class rptEnvelopeHistory
         Me.BottomMargin.Dpi = 254.0!
         Me.BottomMargin.Name = "BottomMargin"
         '
+        'XrLabel1
+        '
+        Me.XrLabel1.BorderColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer))
+        Me.XrLabel1.Borders = DevExpress.XtraPrinting.BorderSide.Top
+        Me.XrLabel1.Dpi = 254.0!
+        Me.XrLabel1.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold)
+        Me.XrLabel1.LocationFloat = New DevExpress.Utils.PointFloat(896.5417!, 0!)
+        Me.XrLabel1.Name = "XrLabel1"
+        Me.XrLabel1.Padding = New DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 254.0!)
+        Me.XrLabel1.SizeF = New System.Drawing.SizeF(645.5836!, 58.0!)
+        Me.XrLabel1.StyleName = "Title"
+        Me.XrLabel1.StylePriority.UseBorderColor = False
+        Me.XrLabel1.StylePriority.UseBorders = False
+        Me.XrLabel1.StylePriority.UseFont = False
+        Me.XrLabel1.StylePriority.UsePadding = False
+        Me.XrLabel1.Text = "Erstellt mit SignFlow"
+        '
         'pageInfo1
         '
+        Me.pageInfo1.BorderColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer))
+        Me.pageInfo1.Borders = DevExpress.XtraPrinting.BorderSide.Top
         Me.pageInfo1.Dpi = 254.0!
         Me.pageInfo1.LocationFloat = New DevExpress.Utils.PointFloat(0!, 0!)
         Me.pageInfo1.Name = "pageInfo1"
         Me.pageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime
-        Me.pageInfo1.SizeF = New System.Drawing.SizeF(470.5625!, 58.0!)
+        Me.pageInfo1.SizeF = New System.Drawing.SizeF(896.5417!, 58.0!)
         Me.pageInfo1.StyleName = "PageInfo"
+        Me.pageInfo1.StylePriority.UseBorderColor = False
+        Me.pageInfo1.StylePriority.UseBorders = False
+        Me.pageInfo1.TextFormatString = "{0:dddd, d. MMMM yyyy HH:mm}"
         '
         'pageInfo2
         '
+        Me.pageInfo2.BorderColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer))
+        Me.pageInfo2.Borders = DevExpress.XtraPrinting.BorderSide.Top
         Me.pageInfo2.Dpi = 254.0!
-        Me.pageInfo2.LocationFloat = New DevExpress.Utils.PointFloat(1166.417!, 0!)
+        Me.pageInfo2.LocationFloat = New DevExpress.Utils.PointFloat(1542.125!, 0!)
         Me.pageInfo2.Name = "pageInfo2"
-        Me.pageInfo2.SizeF = New System.Drawing.SizeF(733.5833!, 58.0!)
+        Me.pageInfo2.SizeF = New System.Drawing.SizeF(357.875!, 58.0!)
         Me.pageInfo2.StyleName = "PageInfo"
+        Me.pageInfo2.StylePriority.UseBorderColor = False
+        Me.pageInfo2.StylePriority.UseBorders = False
         Me.pageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight
         Me.pageInfo2.TextFormatString = "Seite {0} von {1}"
         '
         'ReportHeader
         '
-        Me.ReportHeader.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.XrLabel4, Me.XrLabel3, Me.XrLabel2, Me.label1})
+        Me.ReportHeader.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.label1, Me.XrTable3})
         Me.ReportHeader.Dpi = 254.0!
-        Me.ReportHeader.HeightF = 293.2334!
+        Me.ReportHeader.HeightF = 406.0843!
         Me.ReportHeader.Name = "ReportHeader"
         '
         'label1
         '
+        Me.label1.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
+        Me.label1.BorderColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer))
+        Me.label1.Borders = DevExpress.XtraPrinting.BorderSide.Bottom
+        Me.label1.BorderWidth = 2.0!
         Me.label1.Dpi = 254.0!
-        Me.label1.LocationFloat = New DevExpress.Utils.PointFloat(0!, 0!)
+        Me.label1.Font = New System.Drawing.Font("Segoe UI", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.label1.ForeColor = System.Drawing.Color.Black
+        Me.label1.LocationFloat = New DevExpress.Utils.PointFloat(0.0002422333!, 0!)
         Me.label1.Name = "label1"
-        Me.label1.Padding = New DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 254.0!)
-        Me.label1.SizeF = New System.Drawing.SizeF(1900.0!, 61.4536!)
+        Me.label1.Padding = New DevExpress.XtraPrinting.PaddingInfo(10, 10, 5, 5, 254.0!)
+        Me.label1.SizeF = New System.Drawing.SizeF(1900.0!, 77.32857!)
         Me.label1.StyleName = "Title"
+        Me.label1.StylePriority.UseBackColor = False
+        Me.label1.StylePriority.UseBorderColor = False
+        Me.label1.StylePriority.UseBorders = False
+        Me.label1.StylePriority.UseBorderWidth = False
+        Me.label1.StylePriority.UseFont = False
+        Me.label1.StylePriority.UseForeColor = False
         Me.label1.StylePriority.UsePadding = False
         Me.label1.Text = "Signierungs Zertifikat"
         '
@@ -126,35 +185,63 @@ Partial Public Class rptEnvelopeHistory
         '
         'tableCell1
         '
-        Me.tableCell1.Borders = DevExpress.XtraPrinting.BorderSide.None
+        Me.tableCell1.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
+        Me.tableCell1.BorderColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer))
+        Me.tableCell1.Borders = DevExpress.XtraPrinting.BorderSide.Bottom
+        Me.tableCell1.BorderWidth = 1.0!
         Me.tableCell1.Dpi = 254.0!
+        Me.tableCell1.ForeColor = System.Drawing.Color.Black
         Me.tableCell1.Name = "tableCell1"
         Me.tableCell1.StyleName = "DetailCaption1"
+        Me.tableCell1.StylePriority.UseBackColor = False
+        Me.tableCell1.StylePriority.UseBorderColor = False
         Me.tableCell1.StylePriority.UseBorders = False
-        Me.tableCell1.Text = "Aktion"
+        Me.tableCell1.StylePriority.UseBorderWidth = False
+        Me.tableCell1.StylePriority.UseForeColor = False
+        Me.tableCell1.Text = "Ereignis"
         Me.tableCell1.Weight = 0.626953898336187R
         '
         'tableCell2
         '
+        Me.tableCell2.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
+        Me.tableCell2.BorderColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer))
+        Me.tableCell2.Borders = DevExpress.XtraPrinting.BorderSide.Bottom
+        Me.tableCell2.BorderWidth = 1.0!
         Me.tableCell2.Dpi = 254.0!
+        Me.tableCell2.ForeColor = System.Drawing.Color.Black
         Me.tableCell2.Name = "tableCell2"
         Me.tableCell2.StyleName = "DetailCaption1"
+        Me.tableCell2.StylePriority.UseBackColor = False
+        Me.tableCell2.StylePriority.UseBorderColor = False
+        Me.tableCell2.StylePriority.UseBorders = False
+        Me.tableCell2.StylePriority.UseBorderWidth = False
+        Me.tableCell2.StylePriority.UseForeColor = False
         Me.tableCell2.Text = "Benutzer"
         Me.tableCell2.Weight = 0.30791185539648991R
         '
         'tableCell3
         '
+        Me.tableCell3.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
+        Me.tableCell3.BorderColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer))
+        Me.tableCell3.Borders = DevExpress.XtraPrinting.BorderSide.Bottom
+        Me.tableCell3.BorderWidth = 1.0!
         Me.tableCell3.Dpi = 254.0!
+        Me.tableCell3.ForeColor = System.Drawing.Color.Black
         Me.tableCell3.Name = "tableCell3"
         Me.tableCell3.StyleName = "DetailCaption1"
-        Me.tableCell3.Text = "Datum"
+        Me.tableCell3.StylePriority.UseBackColor = False
+        Me.tableCell3.StylePriority.UseBorderColor = False
+        Me.tableCell3.StylePriority.UseBorders = False
+        Me.tableCell3.StylePriority.UseBorderWidth = False
+        Me.tableCell3.StylePriority.UseForeColor = False
+        Me.tableCell3.Text = "Zeitstempel"
         Me.tableCell3.Weight = 0.25860160582871317R
         '
         'Detail
         '
         Me.Detail.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.table2})
         Me.Detail.Dpi = 254.0!
-        Me.Detail.HeightF = 63.42!
+        Me.Detail.HeightF = 86.174!
         Me.Detail.HierarchyPrintOptions.Indent = 50.8!
         Me.Detail.Name = "Detail"
         '
@@ -163,7 +250,6 @@ Partial Public Class rptEnvelopeHistory
         Me.table2.Dpi = 254.0!
         Me.table2.LocationFloat = New DevExpress.Utils.PointFloat(0!, 0!)
         Me.table2.Name = "table2"
-        Me.table2.OddStyleName = "DetailData3_Odd"
         Me.table2.Rows.AddRange(New DevExpress.XtraReports.UI.XRTableRow() {Me.tableRow2})
         Me.table2.SizeF = New System.Drawing.SizeF(1900.0!, 63.42!)
         '
@@ -178,7 +264,7 @@ Partial Public Class rptEnvelopeHistory
         '
         Me.tableCell4.Borders = DevExpress.XtraPrinting.BorderSide.None
         Me.tableCell4.Dpi = 254.0!
-        Me.tableCell4.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[ItemStatus]")})
+        Me.tableCell4.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[ItemStatusTranslated]")})
         Me.tableCell4.Name = "tableCell4"
         Me.tableCell4.StyleName = "DetailData1"
         Me.tableCell4.StylePriority.UseBorders = False
@@ -253,29 +339,314 @@ Partial Public Class rptEnvelopeHistory
         Me.PageInfo.Name = "PageInfo"
         Me.PageInfo.Padding = New DevExpress.XtraPrinting.PaddingInfo(15, 15, 0, 0, 254.0!)
         '
-        'XrLabel2
+        'XrTable3
         '
-        Me.XrLabel2.Dpi = 254.0!
-        Me.XrLabel2.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Envelope].[User].[FullName]")})
-        Me.XrLabel2.LocationFloat = New DevExpress.Utils.PointFloat(0!, 139.8528!)
-        Me.XrLabel2.Multiline = True
-        Me.XrLabel2.Name = "XrLabel2"
-        Me.XrLabel2.Padding = New DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 254.0!)
-        Me.XrLabel2.SizeF = New System.Drawing.SizeF(857.2501!, 51.94089!)
-        Me.XrLabel2.StylePriority.UsePadding = False
-        Me.XrLabel2.Text = "XrLabel1"
+        Me.XrTable3.Dpi = 254.0!
+        Me.XrTable3.LocationFloat = New DevExpress.Utils.PointFloat(0.0002422333!, 96.60422!)
+        Me.XrTable3.Name = "XrTable3"
+        Me.XrTable3.OddStyleName = "DetailData3_Odd"
+        Me.XrTable3.Rows.AddRange(New DevExpress.XtraReports.UI.XRTableRow() {Me.XrTableRow8, Me.XrTableRow9, Me.XrTableRow10, Me.XrTableRow11})
+        Me.XrTable3.SizeF = New System.Drawing.SizeF(1900.0!, 284.4801!)
         '
-        'XrLabel3
+        'XrTableRow8
         '
-        Me.XrLabel3.Dpi = 254.0!
-        Me.XrLabel3.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Envelope].[User].[Email]")})
-        Me.XrLabel3.LocationFloat = New DevExpress.Utils.PointFloat(0!, 191.7937!)
-        Me.XrLabel3.Multiline = True
-        Me.XrLabel3.Name = "XrLabel3"
-        Me.XrLabel3.Padding = New DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 254.0!)
-        Me.XrLabel3.SizeF = New System.Drawing.SizeF(857.2501!, 51.94089!)
-        Me.XrLabel3.StylePriority.UsePadding = False
-        Me.XrLabel3.Text = "XrLabel1"
+        Me.XrTableRow8.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.XrTableCell13, Me.XrTableCell15})
+        Me.XrTableRow8.Dpi = 254.0!
+        Me.XrTableRow8.Name = "XrTableRow8"
+        Me.XrTableRow8.Weight = 1.0R
+        '
+        'XrTableCell13
+        '
+        Me.XrTableCell13.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
+        Me.XrTableCell13.BorderColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer))
+        Me.XrTableCell13.Borders = DevExpress.XtraPrinting.BorderSide.Bottom
+        Me.XrTableCell13.BorderWidth = 1.0!
+        Me.XrTableCell13.Dpi = 254.0!
+        Me.XrTableCell13.ForeColor = System.Drawing.Color.Black
+        Me.XrTableCell13.Name = "XrTableCell13"
+        Me.XrTableCell13.StyleName = "DetailCaption1"
+        Me.XrTableCell13.StylePriority.UseBackColor = False
+        Me.XrTableCell13.StylePriority.UseBorderColor = False
+        Me.XrTableCell13.StylePriority.UseBorders = False
+        Me.XrTableCell13.StylePriority.UseBorderWidth = False
+        Me.XrTableCell13.StylePriority.UseForeColor = False
+        Me.XrTableCell13.Text = "Ersteller"
+        Me.XrTableCell13.Weight = 0.38139956730411484R
+        '
+        'XrTableCell15
+        '
+        Me.XrTableCell15.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
+        Me.XrTableCell15.BorderColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer))
+        Me.XrTableCell15.Borders = DevExpress.XtraPrinting.BorderSide.Bottom
+        Me.XrTableCell15.BorderWidth = 1.0!
+        Me.XrTableCell15.Dpi = 254.0!
+        Me.XrTableCell15.ForeColor = System.Drawing.Color.Black
+        Me.XrTableCell15.Name = "XrTableCell15"
+        Me.XrTableCell15.StyleName = "DetailCaption1"
+        Me.XrTableCell15.StylePriority.UseBackColor = False
+        Me.XrTableCell15.StylePriority.UseBorderColor = False
+        Me.XrTableCell15.StylePriority.UseBorders = False
+        Me.XrTableCell15.StylePriority.UseBorderWidth = False
+        Me.XrTableCell15.StylePriority.UseForeColor = False
+        Me.XrTableCell15.Text = "Umschlag"
+        Me.XrTableCell15.Weight = 0.49859081604996847R
+        '
+        'XrTableRow9
+        '
+        Me.XrTableRow9.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.XrTableCell14, Me.XrTableCell17, Me.XrTableCell16, Me.XrTableCell18})
+        Me.XrTableRow9.Dpi = 254.0!
+        Me.XrTableRow9.Name = "XrTableRow9"
+        Me.XrTableRow9.Weight = 1.0R
+        '
+        'XrTableCell14
+        '
+        Me.XrTableCell14.BackColor = System.Drawing.Color.White
+        Me.XrTableCell14.BorderColor = System.Drawing.Color.Empty
+        Me.XrTableCell14.Borders = DevExpress.XtraPrinting.BorderSide.None
+        Me.XrTableCell14.Dpi = 254.0!
+        Me.XrTableCell14.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.XrTableCell14.ForeColor = System.Drawing.Color.Black
+        Me.XrTableCell14.Multiline = True
+        Me.XrTableCell14.Name = "XrTableCell14"
+        Me.XrTableCell14.StyleName = "DetailCaption1"
+        Me.XrTableCell14.StylePriority.UseBackColor = False
+        Me.XrTableCell14.StylePriority.UseBorderColor = False
+        Me.XrTableCell14.StylePriority.UseBorders = False
+        Me.XrTableCell14.StylePriority.UseFont = False
+        Me.XrTableCell14.StylePriority.UseForeColor = False
+        Me.XrTableCell14.Text = "Name"
+        Me.XrTableCell14.Weight = 0.11578820509129036R
+        '
+        'XrTableCell16
+        '
+        Me.XrTableCell16.BackColor = System.Drawing.Color.White
+        Me.XrTableCell16.BorderColor = System.Drawing.Color.Empty
+        Me.XrTableCell16.Borders = DevExpress.XtraPrinting.BorderSide.None
+        Me.XrTableCell16.Dpi = 254.0!
+        Me.XrTableCell16.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.XrTableCell16.ForeColor = System.Drawing.Color.Black
+        Me.XrTableCell16.Multiline = True
+        Me.XrTableCell16.Name = "XrTableCell16"
+        Me.XrTableCell16.StyleName = "DetailCaption1"
+        Me.XrTableCell16.StylePriority.UseBackColor = False
+        Me.XrTableCell16.StylePriority.UseBorderColor = False
+        Me.XrTableCell16.StylePriority.UseBorders = False
+        Me.XrTableCell16.StylePriority.UseFont = False
+        Me.XrTableCell16.StylePriority.UseForeColor = False
+        Me.XrTableCell16.Text = "Titel"
+        Me.XrTableCell16.Weight = 0.11578821158083684R
+        '
+        'XrTableCell17
+        '
+        Me.XrTableCell17.BackColor = System.Drawing.Color.White
+        Me.XrTableCell17.BorderColor = System.Drawing.Color.Empty
+        Me.XrTableCell17.Borders = DevExpress.XtraPrinting.BorderSide.None
+        Me.XrTableCell17.Dpi = 254.0!
+        Me.XrTableCell17.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Envelope].[User].[FullName]")})
+        Me.XrTableCell17.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.XrTableCell17.ForeColor = System.Drawing.Color.Black
+        Me.XrTableCell17.Multiline = True
+        Me.XrTableCell17.Name = "XrTableCell17"
+        Me.XrTableCell17.StyleName = "DetailCaption1"
+        Me.XrTableCell17.StylePriority.UseBackColor = False
+        Me.XrTableCell17.StylePriority.UseBorderColor = False
+        Me.XrTableCell17.StylePriority.UseBorders = False
+        Me.XrTableCell17.StylePriority.UseFont = False
+        Me.XrTableCell17.StylePriority.UseForeColor = False
+        Me.XrTableCell17.Text = "XrTableCell17"
+        Me.XrTableCell17.Weight = 0.2656113622128245R
+        '
+        'XrTableCell18
+        '
+        Me.XrTableCell18.BackColor = System.Drawing.Color.White
+        Me.XrTableCell18.BorderColor = System.Drawing.Color.Empty
+        Me.XrTableCell18.Borders = DevExpress.XtraPrinting.BorderSide.None
+        Me.XrTableCell18.Dpi = 254.0!
+        Me.XrTableCell18.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Envelope].[Title]")})
+        Me.XrTableCell18.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.XrTableCell18.ForeColor = System.Drawing.Color.Black
+        Me.XrTableCell18.Multiline = True
+        Me.XrTableCell18.Name = "XrTableCell18"
+        Me.XrTableCell18.StyleName = "DetailCaption1"
+        Me.XrTableCell18.StylePriority.UseBackColor = False
+        Me.XrTableCell18.StylePriority.UseBorderColor = False
+        Me.XrTableCell18.StylePriority.UseBorders = False
+        Me.XrTableCell18.StylePriority.UseFont = False
+        Me.XrTableCell18.StylePriority.UseForeColor = False
+        Me.XrTableCell18.Text = "XrTableCell18"
+        Me.XrTableCell18.Weight = 0.38280260446913167R
+        '
+        'XrTableRow10
+        '
+        Me.XrTableRow10.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.XrTableCell19, Me.XrTableCell20, Me.XrTableCell21, Me.XrTableCell22})
+        Me.XrTableRow10.Dpi = 254.0!
+        Me.XrTableRow10.Name = "XrTableRow10"
+        Me.XrTableRow10.Weight = 1.0R
+        '
+        'XrTableCell19
+        '
+        Me.XrTableCell19.BackColor = System.Drawing.Color.White
+        Me.XrTableCell19.BorderColor = System.Drawing.Color.Empty
+        Me.XrTableCell19.Borders = DevExpress.XtraPrinting.BorderSide.None
+        Me.XrTableCell19.Dpi = 254.0!
+        Me.XrTableCell19.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.XrTableCell19.ForeColor = System.Drawing.Color.Black
+        Me.XrTableCell19.Multiline = True
+        Me.XrTableCell19.Name = "XrTableCell19"
+        Me.XrTableCell19.StyleName = "DetailCaption1"
+        Me.XrTableCell19.StylePriority.UseBackColor = False
+        Me.XrTableCell19.StylePriority.UseBorderColor = False
+        Me.XrTableCell19.StylePriority.UseBorders = False
+        Me.XrTableCell19.StylePriority.UseFont = False
+        Me.XrTableCell19.StylePriority.UseForeColor = False
+        Me.XrTableCell19.Text = "Email"
+        Me.XrTableCell19.Weight = 0.11578820509129036R
+        '
+        'XrTableCell20
+        '
+        Me.XrTableCell20.BackColor = System.Drawing.Color.White
+        Me.XrTableCell20.BorderColor = System.Drawing.Color.Empty
+        Me.XrTableCell20.Borders = DevExpress.XtraPrinting.BorderSide.None
+        Me.XrTableCell20.Dpi = 254.0!
+        Me.XrTableCell20.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Envelope].[User].[Email]")})
+        Me.XrTableCell20.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.XrTableCell20.ForeColor = System.Drawing.Color.Black
+        Me.XrTableCell20.Multiline = True
+        Me.XrTableCell20.Name = "XrTableCell20"
+        Me.XrTableCell20.StyleName = "DetailCaption1"
+        Me.XrTableCell20.StylePriority.UseBackColor = False
+        Me.XrTableCell20.StylePriority.UseBorderColor = False
+        Me.XrTableCell20.StylePriority.UseBorders = False
+        Me.XrTableCell20.StylePriority.UseFont = False
+        Me.XrTableCell20.StylePriority.UseForeColor = False
+        Me.XrTableCell20.Text = "XrTableCell20"
+        Me.XrTableCell20.Weight = 0.2656113622128245R
+        '
+        'XrTableCell21
+        '
+        Me.XrTableCell21.BackColor = System.Drawing.Color.White
+        Me.XrTableCell21.BorderColor = System.Drawing.Color.Empty
+        Me.XrTableCell21.Borders = DevExpress.XtraPrinting.BorderSide.None
+        Me.XrTableCell21.Dpi = 254.0!
+        Me.XrTableCell21.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.XrTableCell21.ForeColor = System.Drawing.Color.Black
+        Me.XrTableCell21.Multiline = True
+        Me.XrTableCell21.Name = "XrTableCell21"
+        Me.XrTableCell21.StyleName = "DetailCaption1"
+        Me.XrTableCell21.StylePriority.UseBackColor = False
+        Me.XrTableCell21.StylePriority.UseBorderColor = False
+        Me.XrTableCell21.StylePriority.UseBorders = False
+        Me.XrTableCell21.StylePriority.UseFont = False
+        Me.XrTableCell21.StylePriority.UseForeColor = False
+        Me.XrTableCell21.Text = "Umschlag-ID"
+        Me.XrTableCell21.Weight = 0.11578821158083684R
+        '
+        'XrTableCell22
+        '
+        Me.XrTableCell22.BackColor = System.Drawing.Color.White
+        Me.XrTableCell22.BorderColor = System.Drawing.Color.Empty
+        Me.XrTableCell22.Borders = DevExpress.XtraPrinting.BorderSide.None
+        Me.XrTableCell22.Dpi = 254.0!
+        Me.XrTableCell22.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Envelope].[Uuid]")})
+        Me.XrTableCell22.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.XrTableCell22.ForeColor = System.Drawing.Color.Black
+        Me.XrTableCell22.Multiline = True
+        Me.XrTableCell22.Name = "XrTableCell22"
+        Me.XrTableCell22.StyleName = "DetailCaption1"
+        Me.XrTableCell22.StylePriority.UseBackColor = False
+        Me.XrTableCell22.StylePriority.UseBorderColor = False
+        Me.XrTableCell22.StylePriority.UseBorders = False
+        Me.XrTableCell22.StylePriority.UseFont = False
+        Me.XrTableCell22.StylePriority.UseForeColor = False
+        Me.XrTableCell22.Text = "XrTableCell22"
+        Me.XrTableCell22.Weight = 0.38280260446913167R
+        '
+        'XrTableRow11
+        '
+        Me.XrTableRow11.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.XrTableCell23, Me.XrTableCell24, Me.XrTableCell25, Me.XrTableCell26})
+        Me.XrTableRow11.Dpi = 254.0!
+        Me.XrTableRow11.Name = "XrTableRow11"
+        Me.XrTableRow11.Weight = 1.0R
+        '
+        'XrTableCell23
+        '
+        Me.XrTableCell23.BackColor = System.Drawing.Color.White
+        Me.XrTableCell23.BorderColor = System.Drawing.Color.Empty
+        Me.XrTableCell23.Borders = DevExpress.XtraPrinting.BorderSide.None
+        Me.XrTableCell23.Dpi = 254.0!
+        Me.XrTableCell23.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.XrTableCell23.ForeColor = System.Drawing.Color.Black
+        Me.XrTableCell23.Multiline = True
+        Me.XrTableCell23.Name = "XrTableCell23"
+        Me.XrTableCell23.StyleName = "DetailCaption1"
+        Me.XrTableCell23.StylePriority.UseBackColor = False
+        Me.XrTableCell23.StylePriority.UseBorderColor = False
+        Me.XrTableCell23.StylePriority.UseBorders = False
+        Me.XrTableCell23.StylePriority.UseFont = False
+        Me.XrTableCell23.StylePriority.UseForeColor = False
+        Me.XrTableCell23.Weight = 0.11578820509129036R
+        '
+        'XrTableCell24
+        '
+        Me.XrTableCell24.BackColor = System.Drawing.Color.White
+        Me.XrTableCell24.BorderColor = System.Drawing.Color.Empty
+        Me.XrTableCell24.Borders = DevExpress.XtraPrinting.BorderSide.None
+        Me.XrTableCell24.Dpi = 254.0!
+        Me.XrTableCell24.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.XrTableCell24.ForeColor = System.Drawing.Color.Black
+        Me.XrTableCell24.Multiline = True
+        Me.XrTableCell24.Name = "XrTableCell24"
+        Me.XrTableCell24.StyleName = "DetailCaption1"
+        Me.XrTableCell24.StylePriority.UseBackColor = False
+        Me.XrTableCell24.StylePriority.UseBorderColor = False
+        Me.XrTableCell24.StylePriority.UseBorders = False
+        Me.XrTableCell24.StylePriority.UseFont = False
+        Me.XrTableCell24.StylePriority.UseForeColor = False
+        Me.XrTableCell24.Weight = 0.2656113622128245R
+        '
+        'XrTableCell25
+        '
+        Me.XrTableCell25.BackColor = System.Drawing.Color.White
+        Me.XrTableCell25.BorderColor = System.Drawing.Color.Empty
+        Me.XrTableCell25.Borders = DevExpress.XtraPrinting.BorderSide.None
+        Me.XrTableCell25.Dpi = 254.0!
+        Me.XrTableCell25.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.XrTableCell25.ForeColor = System.Drawing.Color.Black
+        Me.XrTableCell25.Multiline = True
+        Me.XrTableCell25.Name = "XrTableCell25"
+        Me.XrTableCell25.StyleName = "DetailCaption1"
+        Me.XrTableCell25.StylePriority.UseBackColor = False
+        Me.XrTableCell25.StylePriority.UseBorderColor = False
+        Me.XrTableCell25.StylePriority.UseBorders = False
+        Me.XrTableCell25.StylePriority.UseFont = False
+        Me.XrTableCell25.StylePriority.UseForeColor = False
+        Me.XrTableCell25.Text = "Zertifizierung"
+        Me.XrTableCell25.Weight = 0.11578821158083684R
+        '
+        'XrTableCell26
+        '
+        Me.XrTableCell26.BackColor = System.Drawing.Color.White
+        Me.XrTableCell26.BorderColor = System.Drawing.Color.Empty
+        Me.XrTableCell26.Borders = DevExpress.XtraPrinting.BorderSide.None
+        Me.XrTableCell26.Dpi = 254.0!
+        Me.XrTableCell26.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Envelope].[CertificationType]")})
+        Me.XrTableCell26.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.XrTableCell26.ForeColor = System.Drawing.Color.Black
+        Me.XrTableCell26.Multiline = True
+        Me.XrTableCell26.Name = "XrTableCell26"
+        Me.XrTableCell26.StyleName = "DetailCaption1"
+        Me.XrTableCell26.StylePriority.UseBackColor = False
+        Me.XrTableCell26.StylePriority.UseBorderColor = False
+        Me.XrTableCell26.StylePriority.UseBorders = False
+        Me.XrTableCell26.StylePriority.UseFont = False
+        Me.XrTableCell26.StylePriority.UseForeColor = False
+        Me.XrTableCell26.Text = "XrTableCell26"
+        Me.XrTableCell26.Weight = 0.38280260446913161R
+        '
+        'GalleryDropDown1
+        '
+        Me.GalleryDropDown1.Manager = Nothing
+        Me.GalleryDropDown1.Name = "GalleryDropDown1"
         '
         'ObjectDataSource1
         '
@@ -283,32 +654,6 @@ Partial Public Class rptEnvelopeHistory
         Me.ObjectDataSource1.DataSource = GetType(EnvelopeGenerator.Common.ReportSource)
         Me.ObjectDataSource1.Name = "ObjectDataSource1"
         '
-        'XrLabel4
-        '
-        Me.XrLabel4.Dpi = 254.0!
-        Me.XrLabel4.Font = New System.Drawing.Font("Arial", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.XrLabel4.LocationFloat = New DevExpress.Utils.PointFloat(0!, 87.9119!)
-        Me.XrLabel4.Name = "XrLabel4"
-        Me.XrLabel4.Padding = New DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 254.0!)
-        Me.XrLabel4.SizeF = New System.Drawing.SizeF(426.2708!, 51.94094!)
-        Me.XrLabel4.StyleName = "Title"
-        Me.XrLabel4.StylePriority.UseFont = False
-        Me.XrLabel4.StylePriority.UsePadding = False
-        Me.XrLabel4.Text = "Ersteller:"
-        '
-        'XrLabel1
-        '
-        Me.XrLabel1.Dpi = 254.0!
-        Me.XrLabel1.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold)
-        Me.XrLabel1.LocationFloat = New DevExpress.Utils.PointFloat(470.5626!, 0!)
-        Me.XrLabel1.Name = "XrLabel1"
-        Me.XrLabel1.Padding = New DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 254.0!)
-        Me.XrLabel1.SizeF = New System.Drawing.SizeF(695.8539!, 58.0!)
-        Me.XrLabel1.StyleName = "Title"
-        Me.XrLabel1.StylePriority.UseFont = False
-        Me.XrLabel1.StylePriority.UsePadding = False
-        Me.XrLabel1.Text = "Erstellt mit SignFlow"
-        '
         'rptEnvelopeHistory
         '
         Me.Bands.AddRange(New DevExpress.XtraReports.UI.Band() {Me.TopMargin, Me.BottomMargin, Me.ReportHeader, Me.GroupHeader1, Me.Detail})
@@ -316,7 +661,7 @@ Partial Public Class rptEnvelopeHistory
         Me.DataSource = Me.ObjectDataSource1
         Me.Dpi = 254.0!
         Me.Font = New System.Drawing.Font("Arial", 9.75!)
-        Me.Margins = New System.Drawing.Printing.Margins(100, 100, 100, 100)
+        Me.Margins = New System.Drawing.Printing.Margins(100, 100, 191, 100)
         Me.PageHeight = 2970
         Me.PageWidth = 2100
         Me.PaperKind = System.Drawing.Printing.PaperKind.A4
@@ -324,8 +669,12 @@ Partial Public Class rptEnvelopeHistory
         Me.SnapGridSize = 25.0!
         Me.StyleSheet.AddRange(New DevExpress.XtraReports.UI.XRControlStyle() {Me.Title, Me.DetailCaption1, Me.DetailData1, Me.DetailData3_Odd, Me.PageInfo})
         Me.Version = "21.2"
+        Me.Watermark.ImageSource = New DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("rptEnvelopeHistory.Watermark.ImageSource"))
+        Me.Watermark.ImageTransparency = 220
         CType(Me.table1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.table2, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.XrTable3, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GalleryDropDown1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.ObjectDataSource1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me, System.ComponentModel.ISupportInitialize).EndInit()
 
@@ -355,8 +704,25 @@ Partial Public Class rptEnvelopeHistory
     Friend WithEvents DetailData1 As DevExpress.XtraReports.UI.XRControlStyle
     Friend WithEvents DetailData3_Odd As DevExpress.XtraReports.UI.XRControlStyle
     Friend WithEvents PageInfo As DevExpress.XtraReports.UI.XRControlStyle
-    Friend WithEvents XrLabel3 As DevExpress.XtraReports.UI.XRLabel
-    Friend WithEvents XrLabel2 As DevExpress.XtraReports.UI.XRLabel
-    Friend WithEvents XrLabel4 As DevExpress.XtraReports.UI.XRLabel
     Friend WithEvents XrLabel1 As DevExpress.XtraReports.UI.XRLabel
+    Friend WithEvents XrTable3 As DevExpress.XtraReports.UI.XRTable
+    Friend WithEvents XrTableRow8 As DevExpress.XtraReports.UI.XRTableRow
+    Friend WithEvents XrTableCell13 As DevExpress.XtraReports.UI.XRTableCell
+    Friend WithEvents XrTableCell15 As DevExpress.XtraReports.UI.XRTableCell
+    Friend WithEvents XrTableRow9 As DevExpress.XtraReports.UI.XRTableRow
+    Friend WithEvents XrTableCell14 As DevExpress.XtraReports.UI.XRTableCell
+    Friend WithEvents XrTableCell17 As DevExpress.XtraReports.UI.XRTableCell
+    Friend WithEvents XrTableCell16 As DevExpress.XtraReports.UI.XRTableCell
+    Friend WithEvents XrTableCell18 As DevExpress.XtraReports.UI.XRTableCell
+    Friend WithEvents XrTableRow10 As DevExpress.XtraReports.UI.XRTableRow
+    Friend WithEvents XrTableCell19 As DevExpress.XtraReports.UI.XRTableCell
+    Friend WithEvents XrTableCell20 As DevExpress.XtraReports.UI.XRTableCell
+    Friend WithEvents XrTableCell21 As DevExpress.XtraReports.UI.XRTableCell
+    Friend WithEvents XrTableCell22 As DevExpress.XtraReports.UI.XRTableCell
+    Friend WithEvents XrTableRow11 As DevExpress.XtraReports.UI.XRTableRow
+    Friend WithEvents XrTableCell23 As DevExpress.XtraReports.UI.XRTableCell
+    Friend WithEvents XrTableCell24 As DevExpress.XtraReports.UI.XRTableCell
+    Friend WithEvents XrTableCell25 As DevExpress.XtraReports.UI.XRTableCell
+    Friend WithEvents XrTableCell26 As DevExpress.XtraReports.UI.XRTableCell
+    Friend WithEvents GalleryDropDown1 As DevExpress.XtraBars.Ribbon.GalleryDropDown
 End Class

EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj

@@ -225,7 +225,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="11121780_fi_rr_file_signature_icon.ico" />
     <Content Include="DD_signFLOW_icon_256.ico" />
     <Content Include="DD_signFLOW_Preloader.png" />
     <Content Include="MailLicense.xml">

EnvelopeGenerator.Form/frmSplashScreen.vb

@@ -129,6 +129,9 @@ Public Class frmSplashScreen
             Text = oState.DbConfig.ExternalProgramName
         End If
 
+        ' Hide splashscreen
+        Hide()
+
         Dim oForm As New frmMain(oState)
         oForm.ShowDialog()
 

EnvelopeGenerator.Service/Scheduler.vb

@@ -19,7 +19,8 @@ Public Class Scheduler
         ConnectionString = pConnectionString
         LicenseKey = pLicenseKey
 
-        Logging.LogProvider.SetCurrentLogProvider(New LogProvider(Logger))
+        Dim oLogProvider = New LogProvider(Logger)
+        Logging.LogProvider.SetCurrentLogProvider(oLogProvider)
     End Sub
 
     Public Async Function Start(pInterval As Integer) As Task

EnvelopeGenerator.Test/My Project/Application.Designer.vb

@@ -32,7 +32,7 @@ Namespace My
         
         <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _
         Protected Overrides Sub OnCreateMainForm()
-            Me.MainForm = Global.EnvelopeGenerator.frmFinalizePDF
+            Me.MainForm = Global.EnvelopeGenerator.frmReportViewer
         End Sub
     End Class
 End Namespace

EnvelopeGenerator.Test/My Project/Application.myapp

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <MyApplicationData xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MySubMain>true</MySubMain>
-  <MainForm>frmFinalizePDF</MainForm>
+  <MainForm>frmReportViewer</MainForm>
   <SingleInstance>false</SingleInstance>
   <ShutdownMode>0</ShutdownMode>
   <EnableVisualStyles>true</EnableVisualStyles>

EnvelopeGenerator.Test/frmFinalizePDF.vb

@@ -3,6 +3,7 @@ Imports DigitalData.Modules.Logging
 Imports GdPicture14
 Imports Newtonsoft.Json.Linq
 Imports EnvelopeGenerator.Common.Jobs
+Imports System.IO
 
 Public Class frmFinalizePDF
     Private Const CONNECTIONSTRING = "Server=sDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=+bk8oAbbQP1AzoHtvZUbd+Mbok2f8Fl4miEx1qssJ5yEaEWoQJ9prg4L14fURpPnqi1WMNs9fE4=;"
@@ -12,14 +13,15 @@ Public Class frmFinalizePDF
 
     Private Viewer As GdViewer
     Private Manager As AnnotationManager
-    Private PDFBurner As PDFBurner
+    Private PDFBurner As FinalizeDocument.PDFBurner
 
 
     Private Sub frmFinalizePDF_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         LogConfig = New LogConfig(LogConfig.PathType.CustomPath, Application.StartupPath)
         Database = New MSSQLServer(LogConfig, MSSQLServer.DecryptConnectionString(CONNECTIONSTRING))
 
-        PDFBurner = New PDFBurner(LogConfig, "21182889975216572111813147150675976632")
+
+        PDFBurner = New FinalizeDocument.PDFBurner(LogConfig, "21182889975216572111813147150675976632")
 
         Manager = New AnnotationManager()
         Dim oLicense = New LicenseManager()
@@ -46,13 +48,18 @@ Public Class frmFinalizePDF
 
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
         Dim oDocumentPath = LoadEnvelopeDocument()
+        Dim oFileInfo = New FileInfo(oDocumentPath)
         Dim oTable = LoadAnnotationDataForEnvelope()
         Dim oJsonList = oTable.Rows.
             Cast(Of DataRow).
             Select(Function(r As DataRow) r.Item("VALUE").ToString()).
             ToList()
 
-        PDFBurner.BurnInstantJSONAnnotationsToPDF(oDocumentPath, oJsonList, $"{oDocumentPath}.burned.pdf")
+        Dim oBuffer As Byte() = File.ReadAllBytes(oDocumentPath)
+        Dim oNewBuffer = PDFBurner.BurnInstantJSONAnnotationsToPDF(oBuffer, oJsonList)
+        Dim oNewPath = Path.Combine(oFileInfo.Directory.FullName, $"{oFileInfo.Name}.burned.pdf")
+
+        File.WriteAllBytes(oNewPath, oNewBuffer)
     End Sub
 
     Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click

EnvelopeGenerator.Test/frmReportViewer.Designer.vb

@@ -24,9 +24,9 @@ Partial Class frmReportViewer
     Private Sub InitializeComponent()
         Me.PdfViewer1 = New DevExpress.XtraPdfViewer.PdfViewer()
         Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
+        Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
         Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
-        Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
         CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
@@ -49,6 +49,12 @@ Partial Class frmReportViewer
         Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
         Me.RibbonControl1.Size = New System.Drawing.Size(965, 158)
         '
+        'BarButtonItem1
+        '
+        Me.BarButtonItem1.Caption = "BarButtonItem1"
+        Me.BarButtonItem1.Id = 1
+        Me.BarButtonItem1.Name = "BarButtonItem1"
+        '
         'RibbonPage1
         '
         Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1})
@@ -61,12 +67,6 @@ Partial Class frmReportViewer
         Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
         Me.RibbonPageGroup1.Text = "RibbonPageGroup1"
         '
-        'BarButtonItem1
-        '
-        Me.BarButtonItem1.Caption = "BarButtonItem1"
-        Me.BarButtonItem1.Id = 1
-        Me.BarButtonItem1.Name = "BarButtonItem1"
-        '
         'frmReportViewer
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

EnvelopeGenerator.Test/frmReportViewer.vb

@@ -18,14 +18,15 @@ Public Class frmReportViewer
         ConfigManager = New ConfigManager(Of Config)(LogConfig, "C:\Users\JenneJ\AppData\Roaming\Digital Data\Envelope Generator\1.0.0.0")
         Database = New MSSQLServer(LogConfig, MSSQLServer.DecryptConnectionString(ConfigManager.Config.ConnectionString))
 
-        Dim oTable As DataTable = Database.GetDatatable("SELECT * FROM VWSIG_ENVELOPE_REPORT")
+        Dim oTable As DataTable = Database.GetDatatable("SELECT * FROM VWSIG_ENVELOPE_REPORT ORDER BY POS_WHEN DESC")
         Dim oItems = GetReportSource(oTable)
 
         If oItems.Count = 0 Then
             Exit Sub
         End If
 
-        Dim oEnvelopeId = oItems.First().EnvelopeId
+        'Dim oEnvelopeId = oItems.First().EnvelopeId
+        Dim oEnvelopeId = 20
 
         Dim oState As New State() With {
             .Database = Database,
@@ -34,8 +35,8 @@ Public Class frmReportViewer
         EnvelopeModel = New EnvelopeModel(oState)
         Dim oEnvelope = EnvelopeModel.GetById(oEnvelopeId)
 
-        Dim oCreator As New ReportCreator(oEnvelope)
-        Dim oBuffer = Await oCreator.CreateReport(oItems)
+        Dim oCreator As New ReportCreator(LogConfig, oState)
+        Dim oBuffer = oCreator.CreateReport(oEnvelope)
 
         Using oStream As New IO.MemoryStream(oBuffer)
             PdfViewer1.LoadDocument(oStream)