This commit is contained in:
Jonathan Jenne
2023-12-05 13:50:20 +01:00
parent a1062027c8
commit 763ac96f4e
2 changed files with 14 additions and 10 deletions

View File

@@ -81,7 +81,8 @@ Namespace Jobs
End If End If
GenerateFinalPDF(oEnvelopeData) GenerateFinalPDF(oEnvelopeData)
Await GenerateReportPdf(oId) Dim oReport As Byte() = Await GenerateReportPdf(oId)
MergeDocuments()
Next Next
@@ -139,13 +140,13 @@ Namespace Jobs
Return True Return True
End Function End Function
Private Async Function GenerateReportPdf(pEnvelopeId As Integer) As Task(Of Boolean) Private Async Function GenerateReportPdf(pEnvelopeId As Integer) As Task(Of Byte())
Dim oSql As String = $"SELECT * FROM VWSIG_ENVELOPE_REPORT WHERE ENVELOPE_ID = {pEnvelopeId}" Dim oSql As String = $"SELECT * FROM VWSIG_ENVELOPE_REPORT WHERE ENVELOPE_ID = {pEnvelopeId}"
Dim oTable As DataTable = Database.GetDatatable(oSql) Dim oTable As DataTable = Database.GetDatatable(oSql)
Dim oItems = GetReportSource(oTable) Dim oItems = GetReportSource(oTable)
If oItems.Count = 0 Then If oItems.Count = 0 Then
Return False Return Nothing
End If End If
Dim oState As New State() With { Dim oState As New State() With {
@@ -158,7 +159,7 @@ Namespace Jobs
Dim oCreator As New ReportCreator(oEnvelope) Dim oCreator As New ReportCreator(oEnvelope)
Dim oBuffer = Await oCreator.CreateReport(oItems) Dim oBuffer = Await oCreator.CreateReport(oItems)
Return True Return oBuffer
End Function End Function
Private Function GetReportSource(pDataTable As DataTable) As List(Of ReportItem) Private Function GetReportSource(pDataTable As DataTable) As List(Of ReportItem)

View File

@@ -1,5 +1,5 @@
Imports System.Drawing Imports System.Drawing
Imports DevExpress.Pdf Imports System.IO
Imports DigitalData.Modules.Base Imports DigitalData.Modules.Base
Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Logging
Imports GdPicture14 Imports GdPicture14
@@ -26,9 +26,9 @@ Namespace Jobs
Manager = New AnnotationManager() Manager = New AnnotationManager()
End Sub End Sub
Public Function BurnInstantJSONAnnotationsToPDF(pSourcePath As String, pInstantJSONList As List(Of String), pDestinationPath As String) As Boolean Public Function BurnInstantJSONAnnotationsToPDF(pSourceFilePath As String, pInstantJSONList As List(Of String), pDestinationDirectoryPath As String) As Boolean
If Manager.InitFromFile(pSourcePath) <> GdPictureStatus.OK Then If Manager.InitFromFile(pSourceFilePath) <> GdPictureStatus.OK Then
Logger.Warn("Could not open file [{0}] for burning.", pSourcePath) Logger.Warn("Could not open file [{0}] for burning.", pSourceFilePath)
Return False Return False
End If End If
@@ -39,14 +39,17 @@ Namespace Jobs
End If End If
Next Next
Dim oFileInfo As New FileInfo(pSourceFilePath)
Dim oDestinationFilePath As String = Path.Combine(pDestinationDirectoryPath, oFileInfo.Name)
Try Try
Manager.BurnAnnotationsToPage(RemoveInitialAnnots:=True, VectorMode:=True) Manager.BurnAnnotationsToPage(RemoveInitialAnnots:=True, VectorMode:=True)
Manager.SaveDocumentToPDF(pDestinationPath) Manager.SaveDocumentToPDF(oDestinationFilePath)
Manager.Close() Manager.Close()
Return True Return True
Catch ex As Exception Catch ex As Exception
Logger.Warn("Could not burn and save annotations to file [{0}]!", pDestinationPath) Logger.Warn("Could not burn and save annotations to file [{0}]!", oDestinationFilePath)
Logger.Error(ex) Logger.Error(ex)
Return False Return False