diff --git a/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj b/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj index ae04be06..ebc60984 100644 --- a/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj +++ b/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj @@ -63,19 +63,17 @@ - - False - ..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll + + ..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll - ..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll + ..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll - ..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll + ..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll - - False - ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + + ..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll diff --git a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb b/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb index 9c3abc31..f15171d1 100644 --- a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb +++ b/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb @@ -33,7 +33,7 @@ Namespace Jobs Private PDFMerger As PDFMerger Private ReportCreator As ReportCreator - Private ReadOnly CompleteWaitTime As Integer = 5 + Private ReadOnly CompleteWaitTime As Integer = 1 Private ParentFolderUID As String = "" Private myTempFiles As TempFiles diff --git a/EnvelopeGenerator.Common/My Project/AssemblyInfo.vb b/EnvelopeGenerator.Common/My Project/AssemblyInfo.vb index be1784b9..45778e79 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/Services/ActionService.vb b/EnvelopeGenerator.Common/Services/ActionService.vb index 24c9d2fa..d22ae95c 100644 --- a/EnvelopeGenerator.Common/Services/ActionService.vb +++ b/EnvelopeGenerator.Common/Services/ActionService.vb @@ -34,6 +34,16 @@ Public Class ActionService Return True End Function + Public Function Resend_Receiver(pEnvelope As Envelope, pmail As String) As Boolean + If HistoryService.SetEnvelopeStatus(pEnvelope, Constants.EnvelopeStatus.EnvelopeQueued, pEnvelope.User.Email) = False Then + Return False + End If + Dim oSendResult As Boolean = False + For Each oReceiver In pEnvelope.Receivers + EmailService.SendDocumentReceivedEmail(pEnvelope, oReceiver) + Next + Return oSendResult + End Function Public Function ResendReceiver(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean EmailService.SendDocumentReceivedEmail(pEnvelope, pReceiver) End Function diff --git a/EnvelopeGenerator.Common/Strings/Envelope.en.resx b/EnvelopeGenerator.Common/Strings/Envelope.en.resx index 852d303a..c2932954 100644 --- a/EnvelopeGenerator.Common/Strings/Envelope.en.resx +++ b/EnvelopeGenerator.Common/Strings/Envelope.en.resx @@ -186,6 +186,9 @@ Receiver {0} has an invalid Email Address. + + Invitation has been send once again! + Missing Documents diff --git a/EnvelopeGenerator.Common/Strings/Envelope.resx b/EnvelopeGenerator.Common/Strings/Envelope.resx index c2d29765..eb742922 100644 --- a/EnvelopeGenerator.Common/Strings/Envelope.resx +++ b/EnvelopeGenerator.Common/Strings/Envelope.resx @@ -186,6 +186,9 @@ Empfänger {0} hat keine gültige Email Addresse. + + Die Einladung wurde nochmal versendet! + Fehlendes Dokument diff --git a/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb b/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb index 2958b705..2abe44d8 100644 --- a/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb +++ b/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb @@ -271,6 +271,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Die Einladung wurde nochmal versendet! ähnelt. + ''' + Public Shared ReadOnly Property Invitation_successfully_resend() As String + Get + Return ResourceManager.GetString("Invitation successfully resend", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Zeichenfolge, die Fehlendes Dokument ähnelt. ''' diff --git a/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj b/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj index 76019f6d..e47d52cc 100644 --- a/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj +++ b/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj @@ -43,6 +43,9 @@ DD_signFLOW_icon_256.ico + + true + @@ -75,14 +78,20 @@ ..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll - - ..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll + + False + ..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll - - ..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll + + False + ..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll - - ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + + False + ..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + + + ..\..\2_DLL Projekte\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll False @@ -180,6 +189,7 @@ frmEnvelopeEditor.vb + Designer frmEnvelopeEditor.vb @@ -194,6 +204,7 @@ frmFieldEditor.vb + Designer frmFieldEditor.vb diff --git a/EnvelopeGenerator.Form/app.config b/EnvelopeGenerator.Form/app.config index f3a1fb9f..a5b30491 100644 --- a/EnvelopeGenerator.Form/app.config +++ b/EnvelopeGenerator.Form/app.config @@ -14,10 +14,10 @@ True - Skin/The Bezier + Skin/Office 2019 White - VS 2019 Blue + diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb index 7e50eeaa..41178281 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb @@ -398,7 +398,7 @@ Partial Public Class frmEnvelopeEditor Me.LayoutControlGroup4.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlGroup5}) Me.LayoutControlGroup4.Name = "LayoutControlGroup4" Me.LayoutControlGroup4.Padding = New DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0) - Me.LayoutControlGroup4.Size = New System.Drawing.Size(251, 526) + Me.LayoutControlGroup4.Size = New System.Drawing.Size(251, 530) Me.LayoutControlGroup4.TextVisible = False ' 'LayoutControlGroup5 @@ -406,7 +406,7 @@ Partial Public Class frmEnvelopeEditor Me.LayoutControlGroup5.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem5}) Me.LayoutControlGroup5.Location = New System.Drawing.Point(0, 0) Me.LayoutControlGroup5.Name = "LayoutControlGroup5" - Me.LayoutControlGroup5.Size = New System.Drawing.Size(251, 526) + Me.LayoutControlGroup5.Size = New System.Drawing.Size(251, 530) resources.ApplyResources(Me.LayoutControlGroup5, "LayoutControlGroup5") ' 'LayoutControlItem5 @@ -414,7 +414,7 @@ Partial Public Class frmEnvelopeEditor Me.LayoutControlItem5.Control = Me.GridDocuments Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem5.Name = "LayoutControlItem5" - Me.LayoutControlItem5.Size = New System.Drawing.Size(227, 477) + Me.LayoutControlItem5.Size = New System.Drawing.Size(227, 485) Me.LayoutControlItem5.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem5.TextVisible = False ' @@ -578,7 +578,7 @@ Partial Public Class frmEnvelopeEditor Me.LayoutControlItem2.Control = Me.GridReceivers Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem2.Name = "LayoutControlItem2" - Me.LayoutControlItem2.Size = New System.Drawing.Size(875, 200) + Me.LayoutControlItem2.Size = New System.Drawing.Size(875, 204) Me.LayoutControlItem2.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem2.TextVisible = False ' @@ -611,7 +611,7 @@ Partial Public Class frmEnvelopeEditor Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlGroup1}) Me.Root.Name = "Root" Me.Root.Padding = New DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0) - Me.Root.Size = New System.Drawing.Size(899, 259) + Me.Root.Size = New System.Drawing.Size(899, 263) Me.Root.TextVisible = False ' 'LayoutControlGroup1 @@ -620,7 +620,7 @@ Partial Public Class frmEnvelopeEditor Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 0) Me.LayoutControlGroup1.Name = "LayoutControlGroup1" Me.LayoutControlGroup1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlGroup1.Size = New System.Drawing.Size(899, 259) + Me.LayoutControlGroup1.Size = New System.Drawing.Size(899, 263) resources.ApplyResources(Me.LayoutControlGroup1, "LayoutControlGroup1") ' 'LayoutControlItem3 @@ -629,7 +629,7 @@ Partial Public Class frmEnvelopeEditor Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem3.Name = "LayoutControlItem3" Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem3.Size = New System.Drawing.Size(873, 208) + Me.LayoutControlItem3.Size = New System.Drawing.Size(873, 216) resources.ApplyResources(Me.LayoutControlItem3, "LayoutControlItem3") Me.LayoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem3.TextSize = New System.Drawing.Size(49, 13) diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.en.resx b/EnvelopeGenerator.Form/frmEnvelopeEditor.en.resx index f4fed284..78308364 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.en.resx +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.en.resx @@ -384,6 +384,6 @@ - Sign Flow - Envelope-Editor + signFLOW - Envelope-Editor \ No newline at end of file diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx index 49b707fa..6582bc35 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx @@ -126,7 +126,7 @@ 0, 132 - 14, 39 + 14, 35 Dateiname @@ -439,10 +439,10 @@ 1164, 132 - 0, 658 + 0, 662 - 1164, 26 + 1164, 22 RibbonStatusBar1 @@ -469,7 +469,7 @@ 2 - 223, 473 + 223, 481 0 @@ -496,7 +496,7 @@ Ihre Dokumente - 251, 526 + 251, 530 1 @@ -541,7 +541,7 @@ 334, 17 - 14, 39 + 14, 35 @@ -635,7 +635,7 @@ Combo - 871, 196 + 871, 200 0 @@ -728,13 +728,13 @@ 0 - 23, 64 + 23, 60 Segoe UI, 9.75pt - 853, 172 + 853, 180 2 @@ -764,7 +764,7 @@ Ihre Nachricht - 899, 259 + 899, 263 0 @@ -794,7 +794,7 @@ 0, 0, 0, 0 - 903, 263 + 903, 267 1 @@ -827,7 +827,7 @@ 1 - 903, 526 + 903, 530 0 @@ -860,7 +860,7 @@ 1 - 1164, 526 + 1164, 530 1 @@ -878,7 +878,7 @@ 0 - 792, 17 + 17, 54 557, 17 @@ -948,7 +948,7 @@ CenterScreen - Sign Flow - Umschlag-Editor + signFLOW - Umschlag-Editor SplashScreenManager1 diff --git a/EnvelopeGenerator.Form/frmFieldEditor.en.resx b/EnvelopeGenerator.Form/frmFieldEditor.en.resx index 2308316f..379b5273 100644 --- a/EnvelopeGenerator.Form/frmFieldEditor.en.resx +++ b/EnvelopeGenerator.Form/frmFieldEditor.en.resx @@ -299,6 +299,6 @@ - Sign Flow - Signature-Editor + signFLOW - Signature-Editor \ No newline at end of file diff --git a/EnvelopeGenerator.Form/frmFieldEditor.resx b/EnvelopeGenerator.Form/frmFieldEditor.resx index 04217f00..5eba2d41 100644 --- a/EnvelopeGenerator.Form/frmFieldEditor.resx +++ b/EnvelopeGenerator.Form/frmFieldEditor.resx @@ -538,7 +538,7 @@ CenterScreen - Sign Flow - Signatur-Editor + signFLOW - Signatur-Editor BarButtonItem1 diff --git a/EnvelopeGenerator.Form/frmMain.Designer.vb b/EnvelopeGenerator.Form/frmMain.Designer.vb index 3d0ef245..24411220 100644 --- a/EnvelopeGenerator.Form/frmMain.Designer.vb +++ b/EnvelopeGenerator.Form/frmMain.Designer.vb @@ -60,6 +60,8 @@ Partial Class frmMain Me.BarCheckItem1 = New DevExpress.XtraBars.BarCheckItem() Me.bsitmInfo = New DevExpress.XtraBars.BarStaticItem() Me.bbtnitmEB = New DevExpress.XtraBars.BarButtonItem() + Me.bbtnitmInfoMail = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem2 = 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() @@ -85,8 +87,6 @@ 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.bbtnitmInfoMail = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControl1.Panel1.SuspendLayout() @@ -410,6 +410,20 @@ Partial Class frmMain Me.bbtnitmEB.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitmEB.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.bbtnitmEB.Name = "bbtnitmEB" ' + 'bbtnitmInfoMail + ' + resources.ApplyResources(Me.bbtnitmInfoMail, "bbtnitmInfoMail") + Me.bbtnitmInfoMail.Id = 15 + Me.bbtnitmInfoMail.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitmInfoMail.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.bbtnitmInfoMail.Name = "bbtnitmInfoMail" + ' + 'BarButtonItem2 + ' + resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2") + Me.BarButtonItem2.Id = 16 + Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem2.Name = "BarButtonItem2" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageEnvelopeActions, Me.RibbonPageGroup1, Me.RibbonPageGroup2}) @@ -600,20 +614,6 @@ Partial Class frmMain ' resources.ApplyResources(Me.SaveFileDialog1, "SaveFileDialog1") ' - 'bbtnitmInfoMail - ' - resources.ApplyResources(Me.bbtnitmInfoMail, "bbtnitmInfoMail") - Me.bbtnitmInfoMail.Id = 15 - Me.bbtnitmInfoMail.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.bbtnitmInfoMail.Name = "bbtnitmInfoMail" - ' - 'BarButtonItem2 - ' - resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2") - Me.BarButtonItem2.Id = 16 - Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage1"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonItem2.Name = "BarButtonItem2" - ' 'frmMain ' resources.ApplyResources(Me, "$this") diff --git a/EnvelopeGenerator.Form/frmMain.resx b/EnvelopeGenerator.Form/frmMain.resx index 8b6ae1b0..5b43a9df 100644 --- a/EnvelopeGenerator.Form/frmMain.resx +++ b/EnvelopeGenerator.Form/frmMain.resx @@ -123,7 +123,7 @@ - 0, 162 + 0, 160 Fill @@ -714,7 +714,7 @@ Support Mail - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -734,9 +734,9 @@ - BarButtonItem2 + Einladung erneut versenden - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -777,13 +777,13 @@ Einstellungen - 1090, 162 + 1090, 160 - 0, 656 + 0, 660 - 1090, 26 + 1090, 22 RibbonStatusBar @@ -810,7 +810,7 @@ 2 - 1088, 455 + 1088, 467 2 @@ -828,7 +828,7 @@ 0 - 1088, 455 + 1088, 467 Offene Umschläge @@ -846,7 +846,7 @@ 0 - 1090, 484 + 1090, 490 3 @@ -990,7 +990,7 @@ 195 - 1088, 455 + 1088, 467 3 @@ -1008,7 +1008,7 @@ 0 - 1088, 455 + 1088, 467 Abgeschlossene Umschläge @@ -1068,7 +1068,7 @@ 1 - 1090, 494 + 1090, 500 5 @@ -1097,6 +1097,9 @@ True + + 263 + 6, 13 @@ -1187,7 +1190,7 @@ CenterScreen - Sign Flow + signFLOW SplashScreenManager1 @@ -1369,6 +1372,18 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + bbtnitmInfoMail + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + BarButtonItem2 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPage1 @@ -1501,18 +1516,6 @@ System.Windows.Forms.SaveFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - bbtnitmInfoMail - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - BarButtonItem2 - - - 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 101684e9..846bf482 100644 --- a/EnvelopeGenerator.Form/frmMain.vb +++ b/EnvelopeGenerator.Form/frmMain.vb @@ -11,6 +11,7 @@ Imports DigitalData.Modules.Logging Imports EnvelopeGenerator.Common Imports EnvelopeGenerator.Common.My Imports System.Diagnostics +Imports System.ComponentModel Public Class frmMain Private ReadOnly LogConfig As LogConfig @@ -45,7 +46,7 @@ Public Class frmMain Controller = New EnvelopeListController(State) Try Me.LookAndFeel.UseDefaultLookAndFeel = False - LookAndFeel.SetSkinStyle(SkinStyle.Office2019Colorful, SkinSvgPalette.DefaultSkin) + LookAndFeel.SetSkinStyle(SkinStyle.Office2019White, SkinSvgPalette.DefaultSkin) Catch ex As Exception End Try @@ -204,6 +205,7 @@ Public Class frmMain btnShowDocument.Enabled = True bbtnitmEB.Enabled = False LoadEnvelopeData() + txtEnvelopeIdLabel.Caption = "No Envelope selected" End Select End Sub @@ -548,6 +550,40 @@ Public Class frmMain End Sub Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick + Dim oView As GridView = GridEnvelopes.FocusedView + Dim selReceiver As EnvelopeReceiver + If oView.Name = ViewReceivers.Name Then + selReceiver = oView.GetRow(oView.FocusedRowHandle) + Else + MsgBox(Resources.Envelope.Please_select_a_recipient_from_the_Recipients_tab, MsgBoxStyle.Information, Text) + End If + If ViewEnvelopes.FocusedRowHandle < 0 Or IsNothing(selReceiver) Then + Exit Sub + End If + Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(ViewEnvelopes.FocusedRowHandle) + + Dim oController = New EnvelopeEditorController(State, oEnvelope) + Dim Documents As New BindingList(Of EnvelopeDocument) + Dim Receivers As New BindingList(Of EnvelopeReceiver) + Receivers = New BindingList(Of EnvelopeReceiver)(oController.Envelope.Receivers) + For Each oReceiver As EnvelopeReceiver In Receivers + If oReceiver.Email = selReceiver.Email Then + If oController.ActionService.ResendReceiver(oEnvelope, oReceiver) = True Then + MsgBox(Resources.Envelope.Invitation_successfully_resend, MsgBoxStyle.Information, Text) + End If + End If + Next + + + End Sub + + Private Sub ViewEnvelopes_Click(sender As Object, e As EventArgs) Handles ViewEnvelopes.Click + If ViewEnvelopes.FocusedRowHandle < 0 Then + Exit Sub + End If + Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(ViewEnvelopes.FocusedRowHandle) + + txtEnvelopeIdLabel.Caption = String.Format(txtEnvelopeIdLabel.Tag, oEnvelope.Id) End Sub End Class \ No newline at end of file diff --git a/EnvelopeGenerator.Service/EnvelopeGenerator.Service.vbproj b/EnvelopeGenerator.Service/EnvelopeGenerator.Service.vbproj index 876821f9..f4d0f95e 100644 --- a/EnvelopeGenerator.Service/EnvelopeGenerator.Service.vbproj +++ b/EnvelopeGenerator.Service/EnvelopeGenerator.Service.vbproj @@ -49,26 +49,22 @@ - ..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll + ..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll - ..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll + ..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll - - False - ..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll + + ..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll - - False - ..\..\DDModules\Encryption\bin\Debug\DigitalData.Modules.Encryption.dll + + ..\..\2_DLL Projekte\DDModules\Encryption\bin\Debug\DigitalData.Modules.Encryption.dll - - False - ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + + ..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll - - False - ..\..\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll + + ..\..\2_DLL Projekte\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll False