Merge branch 'master' of http://git.dd:3000/AppStd/EnvelopeGenerator

EnvelopeGenerator.Common/Jobs/FinalizeDocument/PDFBurner.vb

@@ -15,6 +15,7 @@ Namespace Jobs.FinalizeDocument
 
         Private Const ANNOTATION_TYPE_IMAGE = "pspdfkit/image"
         Private Const ANNOTATION_TYPE_INK = "pspdfkit/ink"
+        Private Const ANNOTATION_TYPE_WIDGET = "pspdfkit/widget"
 
         Public Sub New(pLogConfig As LogConfig, pGDPictureLicenseKey As String)
             MyBase.New(pLogConfig)
@@ -77,6 +78,12 @@ Namespace Jobs.FinalizeDocument
                         Case ANNOTATION_TYPE_INK
                             AddInkAnnotation(oAnnotation)
 
+                        Case ANNOTATION_TYPE_WIDGET
+                            'Add form field values
+                            Dim formFieldValue = oAnnotationData.formFieldValues.FirstOrDefault(Function(fv) fv.name = oAnnotation.id)
+                            If formFieldValue IsNot Nothing Then
+                                AddFormFieldValue(oAnnotation, formFieldValue)
+                            End If
                     End Select
                 Next
 
@@ -137,6 +144,33 @@ Namespace Jobs.FinalizeDocument
 
         End Function
 
+        Private Function AddFormFieldValue(pAnnotation As Annotation, formFieldValue As FormFieldValue) As Boolean
+            Try
+                ' Convert pixels to Inches
+                Dim oBounds = pAnnotation.bbox.Select(AddressOf ToInches).ToList()
+
+                Dim oX = oBounds.Item(0)
+                Dim oY = oBounds.Item(1)
+                Dim oWidth = oBounds.Item(2)
+                Dim oHeight = oBounds.Item(3)
+
+                Manager.SelectPage(pAnnotation.pageIndex + 1)
+                ' Add the text annotation
+                Dim ant = Manager.AddTextAnnot(oX, oY, oWidth, oHeight, formFieldValue.value)
+
+                ' Set the font properties
+                ant.FontName = "Arial"
+                ant.FontSize = 8
+                ant.FontStyle = FontStyle.Italic
+                Manager.SaveAnnotationsToPage()
+                Return True
+            Catch ex As Exception
+                Logger.Warn("Could not add image annotation!")
+                Logger.Error(ex)
+                Return False
+            End Try
+        End Function
+
         Private Function ToPointF(pPoints As List(Of Single)) As PointF
             Dim oPoints = pPoints.Select(AddressOf ToInches).ToList()
             Return New PointF(oPoints.Item(0), oPoints.Item(1))
@@ -153,6 +187,7 @@ Namespace Jobs.FinalizeDocument
         Friend Class AnnotationData
             Public Property annotations As List(Of Annotation)
             Public Property attachments As Dictionary(Of String, Attachment)
+            Public Property formFieldValues As List(Of FormFieldValue)
         End Class
 
         Friend Class Annotation
@@ -174,5 +209,10 @@ Namespace Jobs.FinalizeDocument
             Public Property binary As String
             Public Property contentType As String
         End Class
+
+        Friend Class FormFieldValue
+            Public Property name As String
+            Public Property value As String
+        End Class
     End Class
 End Namespace

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

@@ -1,10 +1,10 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
-'     Dieser Code wurde von einem Tool generiert.
-'     Laufzeitversion:4.0.30319.42000
+'     This code was generated by a tool.
+'     Runtime Version:4.0.30319.42000
 '
-'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-'     der Code erneut generiert wird.
+'     Changes to this file may cause incorrect behavior and will be lost if
+'     the code is regenerated.
 ' </auto-generated>
 '------------------------------------------------------------------------------
 
@@ -14,10 +14,10 @@ Option Explicit On
 
 Namespace My
     
-    'HINWEIS: Diese Datei wird automatisch generiert und darf nicht direkt bearbeitet werden.  Wenn Sie Änderungen vornehmen möchten
-    ' oder in dieser Datei Buildfehler auftreten, wechseln Sie zum Projekt-Designer.
-    ' (Wechseln Sie dazu zu den Projekteigenschaften, oder doppelklicken Sie auf den Knoten "Mein Projekt" im
-    ' Projektmappen-Explorer). Nehmen Sie auf der Registerkarte "Anwendung" entsprechende Änderungen vor.
+    'NOTE: This file is auto-generated; do not modify it directly.  To make changes,
+    ' or if you encounter build errors in this file, go to the Project Designer
+    ' (go to Project Properties or double-click the My Project node in
+    ' Solution Explorer), and make changes on the Application tab.
     '
     Partial Friend Class MyApplication
         
@@ -32,7 +32,13 @@ Namespace My
         
         <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _
         Protected Overrides Sub OnCreateMainForm()
-            Me.MainForm = Global.EnvelopeGenerator.frmReportViewer
+            Me.MainForm = Global.EnvelopeGenerator.frmFinalizePDF
         End Sub
+        
+        <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _
+        Protected Overrides Function OnInitialize(ByVal commandLineArgs As System.Collections.ObjectModel.ReadOnlyCollection(Of String)) As Boolean
+            Me.MinimumSplashScreenDisplayTime = 0
+            Return MyBase.OnInitialize(commandLineArgs)
+        End Function
     End Class
 End Namespace

EnvelopeGenerator.Test/My Project/Application.myapp

@@ -1,11 +1,12 @@
 <?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>frmReportViewer</MainForm>
+  <MainForm>frmFinalizePDF</MainForm>
   <SingleInstance>false</SingleInstance>
   <ShutdownMode>0</ShutdownMode>
   <EnableVisualStyles>true</EnableVisualStyles>
   <AuthenticationMode>0</AuthenticationMode>
+  <MinimumSplashScreenDisplayTime>0</MinimumSplashScreenDisplayTime>
   <SaveMySettingsOnExit>true</SaveMySettingsOnExit>
   <HighDpiMpde>false</HighDpiMpde>
 </MyApplicationData>

EnvelopeGenerator.Test/frmFinalizePDF.vb

@@ -14,18 +14,19 @@ Public Class frmFinalizePDF
     Private Viewer As GdViewer
     Private Manager As AnnotationManager
     Private PDFBurner As FinalizeDocument.PDFBurner
-
+    Private pGDPictureLicenseKey As String = "21182889975216572111813147150675976632"
 
     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 FinalizeDocument.PDFBurner(LogConfig, "PS231031-44053-15086")
+        PDFBurner = New FinalizeDocument.PDFBurner(LogConfig, pGDPictureLicenseKey)
 
+        Viewer = New GdViewer()
         Manager = New AnnotationManager()
         Dim oLicense = New LicenseManager()
-        oLicense.RegisterKEY("PS231031-44053-15086")
+        oLicense.RegisterKEY(pGDPictureLicenseKey)
     End Sub
 
     Private Function LoadAnnotationDataForReceiver() As String