diff --git a/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj b/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj index d394d7ea..ae04be06 100644 --- a/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj +++ b/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj @@ -243,11 +243,13 @@ PublicResXFileCodeGenerator Envelope.en.Designer.vb My.Resources + Designer PublicResXFileCodeGenerator Envelope1.Designer.vb My.Resources + Designer PublicResXFileCodeGenerator diff --git a/EnvelopeGenerator.Common/Models/HistoryModel.vb b/EnvelopeGenerator.Common/Models/HistoryModel.vb index 1d36a3ff..e35b61e9 100644 --- a/EnvelopeGenerator.Common/Models/HistoryModel.vb +++ b/EnvelopeGenerator.Common/Models/HistoryModel.vb @@ -10,7 +10,7 @@ Public Class HistoryModel Private Function ToEnvelopeHistoryEntry(pRow As DataRow) As EnvelopeHistoryEntry Return New EnvelopeHistoryEntry() With { - .ActionDate = pRow.Item("ACTION_DATE"), + .ActionDate = pRow.ItemEx(Of Date)("ACTION_DATE", Nothing), .EnvelopeId = pRow.Item("ENVELOPE_ID"), .Status = pRow.Item("STATUS"), .UserReference = pRow.ItemEx("USER_REFERENCE", "") @@ -18,7 +18,7 @@ Public Class HistoryModel End Function Public Function List(pEnvelopeId As Integer) As List(Of EnvelopeHistoryEntry) - Dim oSql = $"SELECT * FROM TBSIG_ENVELOPE_HISTORY WHERE ENVELOPE_ID = {pEnvelopeId} ORDER BY GUID DESC" + Dim oSql = $"SELECT * FROM TBSIG_ENVELOPE_HISTORY WHERE ENVELOPE_ID = {pEnvelopeId} AND ACTION_DATE IS NOT NULL ORDER BY GUID DESC" Dim oTable = Database.GetDatatable(oSql) Return oTable?.Rows. Cast(Of DataRow). diff --git a/EnvelopeGenerator.Common/My Project/AssemblyInfo.vb b/EnvelopeGenerator.Common/My Project/AssemblyInfo.vb index c850157e..367c3a6d 100644 --- a/EnvelopeGenerator.Common/My Project/AssemblyInfo.vb +++ b/EnvelopeGenerator.Common/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' indem Sie "*" wie unten gezeigt eingeben: ' - - + + diff --git a/EnvelopeGenerator.Common/Strings/Envelope.en.resx b/EnvelopeGenerator.Common/Strings/Envelope.en.resx index cc8efa00..852d303a 100644 --- a/EnvelopeGenerator.Common/Strings/Envelope.en.resx +++ b/EnvelopeGenerator.Common/Strings/Envelope.en.resx @@ -154,7 +154,7 @@ Envelope could not be sent! - Envelope Invitations Sent + The invitations have been scheduled for dispatch.s Overview diff --git a/EnvelopeGenerator.Common/Strings/Envelope.resx b/EnvelopeGenerator.Common/Strings/Envelope.resx index 60c875f6..c2d29765 100644 --- a/EnvelopeGenerator.Common/Strings/Envelope.resx +++ b/EnvelopeGenerator.Common/Strings/Envelope.resx @@ -154,7 +154,7 @@ Umschlag konnte nicht gesendet werden! - Die Einladungen wurden versendet + Die Einladungen zum Signieren wurden zum Versand eingereiht. Übersicht diff --git a/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb b/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb index b069d09b..2958b705 100644 --- a/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb +++ b/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb @@ -182,7 +182,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die Die Einladungen wurden versendet ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die Die Einladungen zum Signieren wurden zum Versand eingereiht. ähnelt. ''' Public Shared ReadOnly Property Envelope_Invitations_Sent() As String Get diff --git a/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj b/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj index 7c3a9df6..76019f6d 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.Form/frmMain.Designer.vb b/EnvelopeGenerator.Form/frmMain.Designer.vb index 162f0593..9366475b 100644 --- a/EnvelopeGenerator.Form/frmMain.Designer.vb +++ b/EnvelopeGenerator.Form/frmMain.Designer.vb @@ -27,7 +27,7 @@ Partial Class frmMain Dim GridLevelNode3 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() Dim GridLevelNode4 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() - Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() + Me.XtraTabControlMain = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage() Me.GridEnvelopes = New DevExpress.XtraGrid.GridControl() Me.ViewReceivers = New DevExpress.XtraGrid.Views.Grid.GridView() @@ -59,10 +59,12 @@ Partial Class frmMain Me.btnOpenLogDirectory = New DevExpress.XtraBars.BarButtonItem() Me.BarCheckItem1 = New DevExpress.XtraBars.BarCheckItem() Me.bsitmInfo = New DevExpress.XtraBars.BarStaticItem() + Me.bbtnitmEB = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageEnvelopeActions = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() @@ -84,15 +86,13 @@ Partial Class frmMain Me.GridColumn7 = New DevExpress.XtraGrid.Columns.GridColumn() Me.RefreshTimer = New System.Windows.Forms.Timer(Me.components) Me.SaveFileDialog1 = New System.Windows.Forms.SaveFileDialog() - Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.bbtnitmEB = New DevExpress.XtraBars.BarButtonItem() CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControl1.Panel1.SuspendLayout() CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControl1.SuspendLayout() - CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.XtraTabControl1.SuspendLayout() + CType(Me.XtraTabControlMain, System.ComponentModel.ISupportInitialize).BeginInit() + Me.XtraTabControlMain.SuspendLayout() Me.XtraTabPage1.SuspendLayout() CType(Me.GridEnvelopes, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ViewReceivers, System.ComponentModel.ISupportInitialize).BeginInit() @@ -120,7 +120,7 @@ Partial Class frmMain ' 'SplitContainerControl1.Panel1 ' - Me.SplitContainerControl1.Panel1.Controls.Add(Me.XtraTabControl1) + Me.SplitContainerControl1.Panel1.Controls.Add(Me.XtraTabControlMain) resources.ApplyResources(Me.SplitContainerControl1.Panel1, "SplitContainerControl1.Panel1") ' 'SplitContainerControl1.Panel2 @@ -128,12 +128,12 @@ Partial Class frmMain resources.ApplyResources(Me.SplitContainerControl1.Panel2, "SplitContainerControl1.Panel2") Me.SplitContainerControl1.SplitterPosition = 272 ' - 'XtraTabControl1 + 'XtraTabControlMain ' - resources.ApplyResources(Me.XtraTabControl1, "XtraTabControl1") - Me.XtraTabControl1.Name = "XtraTabControl1" - Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1 - Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2}) + resources.ApplyResources(Me.XtraTabControlMain, "XtraTabControlMain") + Me.XtraTabControlMain.Name = "XtraTabControlMain" + Me.XtraTabControlMain.SelectedTabPage = Me.XtraTabPage1 + Me.XtraTabControlMain.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2}) ' 'XtraTabPage1 ' @@ -401,6 +401,14 @@ Partial Class frmMain Me.bsitmInfo.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph Me.bsitmInfo.Visibility = DevExpress.XtraBars.BarItemVisibility.Never ' + 'bbtnitmEB + ' + resources.ApplyResources(Me.bbtnitmEB, "bbtnitmEB") + Me.bbtnitmEB.Enabled = False + Me.bbtnitmEB.Id = 14 + Me.bbtnitmEB.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitmEB.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.bbtnitmEB.Name = "bbtnitmEB" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageEnvelopeActions, Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup4}) @@ -430,6 +438,11 @@ Partial Class frmMain Me.RibbonPageGroup2.Name = "RibbonPageGroup2" resources.ApplyResources(Me.RibbonPageGroup2, "RibbonPageGroup2") ' + 'RibbonPageGroup4 + ' + Me.RibbonPageGroup4.Name = "RibbonPageGroup4" + resources.ApplyResources(Me.RibbonPageGroup4, "RibbonPageGroup4") + ' 'RibbonPage2 ' Me.RibbonPage2.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3}) @@ -589,19 +602,6 @@ Partial Class frmMain ' resources.ApplyResources(Me.SaveFileDialog1, "SaveFileDialog1") ' - 'RibbonPageGroup4 - ' - Me.RibbonPageGroup4.Name = "RibbonPageGroup4" - resources.ApplyResources(Me.RibbonPageGroup4, "RibbonPageGroup4") - ' - 'bbtnitmEB - ' - resources.ApplyResources(Me.bbtnitmEB, "bbtnitmEB") - Me.bbtnitmEB.Enabled = False - Me.bbtnitmEB.Id = 14 - Me.bbtnitmEB.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.bbtnitmEB.Name = "bbtnitmEB" - ' 'frmMain ' resources.ApplyResources(Me, "$this") @@ -618,8 +618,8 @@ Partial Class frmMain CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerControl1.ResumeLayout(False) - CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() - Me.XtraTabControl1.ResumeLayout(False) + CType(Me.XtraTabControlMain, System.ComponentModel.ISupportInitialize).EndInit() + Me.XtraTabControlMain.ResumeLayout(False) Me.XtraTabPage1.ResumeLayout(False) CType(Me.GridEnvelopes, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ViewReceivers, System.ComponentModel.ISupportInitialize).EndInit() @@ -653,7 +653,7 @@ Partial Class frmMain Friend WithEvents ColEmail As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents ColReceiverStatus As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl - Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl + Friend WithEvents XtraTabControlMain As DevExpress.XtraTab.XtraTabControl Friend WithEvents XtraTabPage1 As DevExpress.XtraTab.XtraTabPage Friend WithEvents XtraTabPage2 As DevExpress.XtraTab.XtraTabPage Friend WithEvents GridCompleted As DevExpress.XtraGrid.GridControl diff --git a/EnvelopeGenerator.Form/frmMain.resx b/EnvelopeGenerator.Form/frmMain.resx index 884fd395..b6466b0d 100644 --- a/EnvelopeGenerator.Form/frmMain.resx +++ b/EnvelopeGenerator.Form/frmMain.resx @@ -125,10 +125,10 @@ 0, 162 - + Fill - + 0, 0 @@ -684,7 +684,7 @@ Ergebnisbericht anzeigen - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -799,15 +799,15 @@ DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - XtraTabControl1 + XtraTabControlMain 0 - + 1090, 484 - + 3 @@ -979,21 +979,21 @@ DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - XtraTabControl1 + XtraTabControlMain 1 - - XtraTabControl1 + + XtraTabControlMain - + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - + SplitContainerControl1.Panel1 - + 0 @@ -1322,6 +1322,12 @@ DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + bbtnitmEB + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPage1 @@ -1346,6 +1352,12 @@ DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + RibbonPageGroup4 + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPage2 @@ -1454,18 +1466,6 @@ System.Windows.Forms.SaveFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - RibbonPageGroup4 - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - bbtnitmEB - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - frmMain diff --git a/EnvelopeGenerator.Form/frmMain.vb b/EnvelopeGenerator.Form/frmMain.vb index 48badb18..5f0c5e8a 100644 --- a/EnvelopeGenerator.Form/frmMain.vb +++ b/EnvelopeGenerator.Form/frmMain.vb @@ -55,8 +55,12 @@ Public Class frmMain Private Sub LoadEnvelopeData() Try RefreshHelper.SaveViewInfo() - LoadEnvelopes() - LoadCompletedEnvelopes() + If XtraTabControlMain.SelectedTabPageIndex = 0 Then + LoadEnvelopes() + ElseIf XtraTabControlMain.SelectedTabPageIndex = 1 Then + LoadCompletedEnvelopes() + End If + RefreshHelper.LoadViewInfo() 'LoadCharts() @@ -183,20 +187,22 @@ Public Class frmMain TempFiles.CleanUp() End Sub - Private Sub XtraTabControl1_SelectedPageChanged(sender As Object, e As DevExpress.XtraTab.TabPageChangedEventArgs) Handles XtraTabControl1.SelectedPageChanged - Select Case XtraTabControl1.SelectedTabPageIndex + Private Sub XtraTabControl1_SelectedPageChanged(sender As Object, e As DevExpress.XtraTab.TabPageChangedEventArgs) Handles XtraTabControlMain.SelectedPageChanged + Select Case XtraTabControlMain.SelectedTabPageIndex Case 1 btnEditEnvelope.Enabled = False btnDeleteEnvelope.Enabled = False btnContactReceiver.Enabled = False btnShowDocument.Enabled = False bbtnitmEB.Enabled = True + LoadEnvelopeData() Case 0 btnEditEnvelope.Enabled = True btnDeleteEnvelope.Enabled = True btnContactReceiver.Enabled = True btnShowDocument.Enabled = True bbtnitmEB.Enabled = False + LoadEnvelopeData() End Select End Sub @@ -220,30 +226,43 @@ Public Class frmMain End If End Sub Private Sub bbtnitmEB_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitmEB.ItemClick - If ViewEnvelopes.FocusedRowHandle < 0 Then - Exit Sub - End If - Me.Cursor = Cursors.WaitCursor - Dim oEnvelope As Envelope = ViewCompleted.GetRow(ViewCompleted.FocusedRowHandle) - GetResRepFileStreamByte(oEnvelope.Id) - Dim oTempFolder = TempFiles.TempPath - Dim oTempFilename = String.Concat(oTempFolder, "\", $"ViewEnvResReport_{oEnvelope.Id}.pdf") - If File.Exists(oTempFilename) Then - Try - File.OpenWrite(oTempFilename) - Catch ex As Exception - MsgBox("File might already be open?", MsgBoxStyle.Exclamation) + Try + If ViewEnvelopes.FocusedRowHandle < 0 Then Exit Sub - End Try + End If + Me.Cursor = Cursors.WaitCursor + Dim oEnvelope As Envelope = ViewCompleted.GetRow(ViewCompleted.FocusedRowHandle) + GetResRepFileStreamByte(oEnvelope.Id) + Dim oTempFolder = TempFiles.TempPath + Dim oFilename = "ViewEnvResReport" + Dim oVersion As Integer = 0 + Dim oTempFilename = String.Concat(oTempFolder, "\", $"{oFilename}_{oEnvelope.Id}.pdf") + Do While File.Exists(oTempFilename) + oVersion += 1 + oTempFilename = String.Concat(oTempFolder, "\", $"{oFilename}_{oEnvelope.Id}_", oVersion.ToString, ".pdf") + Loop + 'If File.Exists(oTempFilename) Then + ' oVersion += 1 + ' oTempFilename = String.Concat(oTempFolder, "\", $"ViewEnvResReport_{oEnvelope.Id}_", oVersion.ToString, ".pdf") + ' Try + ' File.OpenWrite(oTempFilename) + ' Catch ex As Exception + ' MsgBox("File might already be open?", MsgBoxStyle.Exclamation) + ' Exit Sub + ' End Try - File.Delete(oTempFilename) - End If - downloadResFile(oTempFilename) + ' File.Delete(oTempFilename) + 'End If + downloadResFile(oTempFilename) + + Catch ex As Exception + MsgBox(ex.Message, MsgBoxStyle.Exclamation) + End Try Me.Cursor = Cursors.Default End Sub Private Sub ViewEnvelopes_CustomDrawCell(sender As Object, e As DevExpress.XtraGrid.Views.Base.RowCellCustomDrawEventArgs) Handles ViewEnvelopes.CustomDrawCell - If e.RowHandle < 0 Or XtraTabControl1.SelectedTabPageIndex = 1 Then + If e.RowHandle < 0 Or XtraTabControlMain.SelectedTabPageIndex = 1 Then Exit Sub End If @@ -421,9 +440,6 @@ Public Class frmMain End Try End Sub Private Sub downloadResFile(ByVal sFileName As String) - - Dim strSql As String - 'For Document Try If Not myResFileData Is Nothing Then 'Read image data into a file stream diff --git a/EnvelopeGenerator.Test/EnvelopeGenerator.Test.vbproj b/EnvelopeGenerator.Test/EnvelopeGenerator.Test.vbproj index aff3f80d..9ab90b75 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 f65f82b7..06be55e9 100644 --- a/EnvelopeGenerator.Test/frmFinalizePDF.vb +++ b/EnvelopeGenerator.Test/frmFinalizePDF.vb @@ -49,19 +49,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.sln b/EnvelopeGenerator.sln index 565f0d0c..650cab96 100644 --- a/EnvelopeGenerator.sln +++ b/EnvelopeGenerator.sln @@ -31,8 +31,8 @@ Global {089D5634-FB6B-42D0-B912-7AA7457044E7}.Debug|Any CPU.Build.0 = Debug|Any CPU {089D5634-FB6B-42D0-B912-7AA7457044E7}.Release|Any CPU.ActiveCfg = Release|Any CPU {089D5634-FB6B-42D0-B912-7AA7457044E7}.Release|Any CPU.Build.0 = Release|Any CPU - {6D56C01F-D6CB-4D8A-BD3D-4FD34326998C}.Debug|Any CPU.ActiveCfg = Release|Any CPU - {6D56C01F-D6CB-4D8A-BD3D-4FD34326998C}.Debug|Any CPU.Build.0 = Release|Any CPU + {6D56C01F-D6CB-4D8A-BD3D-4FD34326998C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6D56C01F-D6CB-4D8A-BD3D-4FD34326998C}.Debug|Any CPU.Build.0 = Debug|Any CPU {6D56C01F-D6CB-4D8A-BD3D-4FD34326998C}.Release|Any CPU.ActiveCfg = Release|Any CPU {6D56C01F-D6CB-4D8A-BD3D-4FD34326998C}.Release|Any CPU.Build.0 = Release|Any CPU {6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU