From 119f54e8aa529f6c1f0d67786bb73ab243edc361 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 21 Dec 2023 16:28:14 +0100 Subject: [PATCH] report & service fixes --- .../EnvelopeGenerator.Common.vbproj | 3 + .../FinalizeDocument/FinalizeDocumentJob.vb | 18 +- .../Jobs/FinalizeDocument/ReportItem.vb | 11 +- .../Reports/rptEnvelopeHistory.Designer.vb | 508 +++++++++++++++--- .../Reports/rptEnvelopeHistory.resx | 6 + .../11121780_fi_rr_file_signature_icon.ico | Bin 6589 -> 0 bytes .../EnvelopeGenerator.Form.vbproj | 1 - EnvelopeGenerator.Form/frmSplashScreen.vb | 3 + EnvelopeGenerator.Service/Scheduler.vb | 3 +- .../My Project/Application.Designer.vb | 2 +- .../My Project/Application.myapp | 2 +- EnvelopeGenerator.Test/frmFinalizePDF.vb | 13 +- .../frmReportViewer.Designer.vb | 14 +- EnvelopeGenerator.Test/frmReportViewer.vb | 9 +- 14 files changed, 495 insertions(+), 98 deletions(-) delete mode 100644 EnvelopeGenerator.Form/11121780_fi_rr_file_signature_icon.ico diff --git a/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj b/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj index 3e4dc695..b6d6609e 100644 --- a/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj +++ b/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj @@ -56,8 +56,11 @@ + + + diff --git a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb b/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb index 5862440f..83e26a7d 100644 --- a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb +++ b/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() diff --git a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/ReportItem.vb b/EnvelopeGenerator.Common/Jobs/FinalizeDocument/ReportItem.vb index 6257913e..063235f6 100644 --- a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/ReportItem.vb +++ b/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 diff --git a/EnvelopeGenerator.Common/Reports/rptEnvelopeHistory.Designer.vb b/EnvelopeGenerator.Common/Reports/rptEnvelopeHistory.Designer.vb index 778a96f1..34f4160c 100644 --- a/EnvelopeGenerator.Common/Reports/rptEnvelopeHistory.Designer.vb +++ b/EnvelopeGenerator.Common/Reports/rptEnvelopeHistory.Designer.vb @@ -20,8 +20,10 @@ Partial Public Class rptEnvelopeHistory _ 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 - ' - 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" - ' - 'XrLabel3 - ' - 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" + 'XrTable3 + ' + 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!) + ' + 'XrTableRow8 + ' + 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 diff --git a/EnvelopeGenerator.Common/Reports/rptEnvelopeHistory.resx b/EnvelopeGenerator.Common/Reports/rptEnvelopeHistory.resx index 014e1c08..4fe771d3 100644 --- a/EnvelopeGenerator.Common/Reports/rptEnvelopeHistory.resx +++ b/EnvelopeGenerator.Common/Reports/rptEnvelopeHistory.resx @@ -117,7 +117,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 56 + 17, 17 + + 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 + \ No newline at end of file diff --git a/EnvelopeGenerator.Form/11121780_fi_rr_file_signature_icon.ico b/EnvelopeGenerator.Form/11121780_fi_rr_file_signature_icon.ico deleted file mode 100644 index c4a02d113c9b4473f8ab0d35f46f3d433a572a5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6589 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 Q`tt(lXu>rr)$F7H4;m(0VgLXD diff --git a/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj b/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj index 73d27104..ddfa98e1 100644 --- a/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj +++ b/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj @@ -225,7 +225,6 @@ - diff --git a/EnvelopeGenerator.Form/frmSplashScreen.vb b/EnvelopeGenerator.Form/frmSplashScreen.vb index e9f945c1..9bc19d66 100644 --- a/EnvelopeGenerator.Form/frmSplashScreen.vb +++ b/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() diff --git a/EnvelopeGenerator.Service/Scheduler.vb b/EnvelopeGenerator.Service/Scheduler.vb index 232a9e51..aab000f0 100644 --- a/EnvelopeGenerator.Service/Scheduler.vb +++ b/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 diff --git a/EnvelopeGenerator.Test/My Project/Application.Designer.vb b/EnvelopeGenerator.Test/My Project/Application.Designer.vb index 141e93d3..bbde8f46 100644 --- a/EnvelopeGenerator.Test/My Project/Application.Designer.vb +++ b/EnvelopeGenerator.Test/My Project/Application.Designer.vb @@ -32,7 +32,7 @@ Namespace My _ Protected Overrides Sub OnCreateMainForm() - Me.MainForm = Global.EnvelopeGenerator.frmFinalizePDF + Me.MainForm = Global.EnvelopeGenerator.frmReportViewer End Sub End Class End Namespace diff --git a/EnvelopeGenerator.Test/My Project/Application.myapp b/EnvelopeGenerator.Test/My Project/Application.myapp index 3626ace3..e67246c4 100644 --- a/EnvelopeGenerator.Test/My Project/Application.myapp +++ b/EnvelopeGenerator.Test/My Project/Application.myapp @@ -1,7 +1,7 @@  true - frmFinalizePDF + frmReportViewer false 0 true diff --git a/EnvelopeGenerator.Test/frmFinalizePDF.vb b/EnvelopeGenerator.Test/frmFinalizePDF.vb index 326b5e60..eec4fede 100644 --- a/EnvelopeGenerator.Test/frmFinalizePDF.vb +++ b/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 diff --git a/EnvelopeGenerator.Test/frmReportViewer.Designer.vb b/EnvelopeGenerator.Test/frmReportViewer.Designer.vb index 435741c3..943ce8ff 100644 --- a/EnvelopeGenerator.Test/frmReportViewer.Designer.vb +++ b/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!) diff --git a/EnvelopeGenerator.Test/frmReportViewer.vb b/EnvelopeGenerator.Test/frmReportViewer.vb index 911b787e..183e5faf 100644 --- a/EnvelopeGenerator.Test/frmReportViewer.vb +++ b/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)