diff --git a/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj b/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj index f2e60e5a..d54f12f4 100644 --- a/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj +++ b/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj @@ -84,6 +84,10 @@ ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + + False + ..\EnvelopeGenerator.Common\bin\Debug\EnvelopeGenerator.Common.dll + D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll diff --git a/EnvelopeGenerator.Test/EnvelopeGenerator.Test.vbproj b/EnvelopeGenerator.Test/EnvelopeGenerator.Test.vbproj index 3dd62d22..69e4a811 100644 --- a/EnvelopeGenerator.Test/EnvelopeGenerator.Test.vbproj +++ b/EnvelopeGenerator.Test/EnvelopeGenerator.Test.vbproj @@ -76,6 +76,9 @@ False ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + + ..\EnvelopeGenerator.Common\bin\Debug\EnvelopeGenerator.Common.dll + False D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll diff --git a/EnvelopeGenerator.Test/My Project/Application.Designer.vb b/EnvelopeGenerator.Test/My Project/Application.Designer.vb index f0d5848c..3dd72485 100644 --- a/EnvelopeGenerator.Test/My Project/Application.Designer.vb +++ b/EnvelopeGenerator.Test/My Project/Application.Designer.vb @@ -1,10 +1,10 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ @@ -14,10 +14,10 @@ Option Explicit On Namespace My - '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. + '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. ' Partial Friend Class MyApplication diff --git a/EnvelopeGenerator.Test/My Project/Settings.Designer.vb b/EnvelopeGenerator.Test/My Project/Settings.Designer.vb index 280a1db6..4f5cd732 100644 --- a/EnvelopeGenerator.Test/My Project/Settings.Designer.vb +++ b/EnvelopeGenerator.Test/My Project/Settings.Designer.vb @@ -1,26 +1,97 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.18047 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ +Option Strict On +Option Explicit On + + Namespace My + + _ + Partial Friend NotInheritable Class Settings + Inherits Global.System.Configuration.ApplicationSettingsBase + + Private Shared defaultInstance As Settings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New Settings()),Settings) + +#Region "Automatische My.Settings-Speicherfunktion" +#If _MyType = "WindowsForms" Then + Private Shared addedHandler As Boolean + Private Shared addedHandlerLockObject As New Object - - Friend NotInheritable Partial Class Settings - Inherits System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As Settings = (CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New Settings()), Settings)) + _ + Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs) + If My.Application.SaveMySettingsOnExit Then + End If + End Sub +#End If +#End Region + Public Shared ReadOnly Property [Default]() As Settings Get + +#If _MyType = "WindowsForms" Then + If Not addedHandler Then + SyncLock addedHandlerLockObject + If Not addedHandler Then + AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings + addedHandler = True + End If + End SyncLock + End If +#End If Return defaultInstance End Get End Property + + _ + Public Property envelopeId() As String + Get + Return CType(Me("envelopeId"),String) + End Get + Set + Me("envelopeId") = value + End Set + End Property + + _ + Public Property ReceiverID() As String + Get + Return CType(Me("ReceiverID"),String) + End Get + Set + Me("ReceiverID") = value + End Set + End Property End Class End Namespace + +Namespace My + + _ + Friend Module MySettingsProperty + + _ + Friend ReadOnly Property Settings() As Global.EnvelopeGenerator.My.Settings + Get + Return Global.EnvelopeGenerator.My.Settings.Default + End Get + End Property + End Module +End Namespace diff --git a/EnvelopeGenerator.Test/My Project/Settings.settings b/EnvelopeGenerator.Test/My Project/Settings.settings index 39645652..9e09f4dd 100644 --- a/EnvelopeGenerator.Test/My Project/Settings.settings +++ b/EnvelopeGenerator.Test/My Project/Settings.settings @@ -1,7 +1,12 @@  - - - - - - + + + + + 10 + + + 11 + + + \ No newline at end of file diff --git a/EnvelopeGenerator.Test/app.config b/EnvelopeGenerator.Test/app.config index 917d5961..5be4edda 100644 --- a/EnvelopeGenerator.Test/app.config +++ b/EnvelopeGenerator.Test/app.config @@ -4,6 +4,9 @@
+ +
+ @@ -38,4 +41,14 @@ + + + + 10 + + + 11 + + + \ No newline at end of file diff --git a/EnvelopeGenerator.Test/frmFinalizePDF.Designer.vb b/EnvelopeGenerator.Test/frmFinalizePDF.Designer.vb index 47177a45..5a2794e2 100644 --- a/EnvelopeGenerator.Test/frmFinalizePDF.Designer.vb +++ b/EnvelopeGenerator.Test/frmFinalizePDF.Designer.vb @@ -23,12 +23,12 @@ Partial Class frmFinalizePDF Private Sub InitializeComponent() Me.txtReceiver = New System.Windows.Forms.TextBox() - Me.txtEnvelope = New System.Windows.Forms.TextBox() Me.Label1 = New System.Windows.Forms.Label() Me.Label2 = New System.Windows.Forms.Label() Me.Button1 = New System.Windows.Forms.Button() Me.Button2 = New System.Windows.Forms.Button() Me.txtResult = New System.Windows.Forms.TextBox() + Me.txtEnvelope = New System.Windows.Forms.TextBox() Me.SuspendLayout() ' 'txtReceiver @@ -37,15 +37,7 @@ Partial Class frmFinalizePDF Me.txtReceiver.Name = "txtReceiver" Me.txtReceiver.Size = New System.Drawing.Size(100, 20) Me.txtReceiver.TabIndex = 0 - Me.txtReceiver.Text = "11" - ' - 'txtEnvelope - ' - Me.txtEnvelope.Location = New System.Drawing.Point(15, 23) - Me.txtEnvelope.Name = "txtEnvelope" - Me.txtEnvelope.Size = New System.Drawing.Size(100, 20) - Me.txtEnvelope.TabIndex = 0 - Me.txtEnvelope.Text = "10" + ' 'Label1 ' @@ -83,13 +75,21 @@ Partial Class frmFinalizePDF Me.Button2.Text = "Merge Json" Me.Button2.UseVisualStyleBackColor = True ' - 'TextBox1 + 'txtResult ' Me.txtResult.Location = New System.Drawing.Point(333, 12) Me.txtResult.Multiline = True - Me.txtResult.Name = "TextBox1" + Me.txtResult.Name = "txtResult" Me.txtResult.Size = New System.Drawing.Size(455, 426) Me.txtResult.TabIndex = 4 + ' + 'txtEnvelope + ' + Me.txtEnvelope.Location = New System.Drawing.Point(15, 23) + Me.txtEnvelope.Name = "txtEnvelope" + Me.txtEnvelope.Size = New System.Drawing.Size(100, 20) + Me.txtEnvelope.TabIndex = 0 + ' 'frmFinalizePDF ' diff --git a/EnvelopeGenerator.Test/frmFinalizePDF.vb b/EnvelopeGenerator.Test/frmFinalizePDF.vb index 7608dd35..5c83fe4b 100644 --- a/EnvelopeGenerator.Test/frmFinalizePDF.vb +++ b/EnvelopeGenerator.Test/frmFinalizePDF.vb @@ -48,19 +48,25 @@ Public Class frmFinalizePDF End Function 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() + Try - Dim oBuffer As Byte() = File.ReadAllBytes(oDocumentPath) - Dim oNewBuffer = PDFBurner.BurnInstantJSONAnnotationsToPDF(oBuffer, oJsonList) - Dim oNewPath = Path.Combine(oFileInfo.Directory.FullName, $"{oFileInfo.Name}.burned.pdf") + 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() + + 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) + Catch ex As Exception + MsgBox(ex.Message, MsgBoxStyle.Critical) + End Try - File.WriteAllBytes(oNewPath, oNewBuffer) End Sub Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click diff --git a/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj b/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj index 62fadd3c..84279d89 100644 --- a/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj +++ b/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj @@ -13,7 +13,7 @@ - +