diff --git a/EnvelopeGenerator.CommonServices/Models/ReceiverModel.vb b/EnvelopeGenerator.CommonServices/Models/ReceiverModel.vb
index 55952345..e4690ae4 100644
--- a/EnvelopeGenerator.CommonServices/Models/ReceiverModel.vb
+++ b/EnvelopeGenerator.CommonServices/Models/ReceiverModel.vb
@@ -1,8 +1,5 @@
Imports System.Data.SqlClient
-Imports System.Net.Mail
-Imports DevExpress.DataProcessing
Imports DigitalData.Modules.Base
-Imports EnvelopeGenerator.CommonServices.EnvelopeGenerator.Domain.Entities
Imports EnvelopeGenerator.Domain.Constants
Imports EnvelopeGenerator.Domain.Entities
diff --git a/EnvelopeGenerator.CommonServices/Models/ReceiverVM.vb b/EnvelopeGenerator.CommonServices/Models/ReceiverVM.vb
index 7a570c4e..5aad4206 100644
--- a/EnvelopeGenerator.CommonServices/Models/ReceiverVM.vb
+++ b/EnvelopeGenerator.CommonServices/Models/ReceiverVM.vb
@@ -2,102 +2,119 @@
Imports EnvelopeGenerator.Domain
Imports EnvelopeGenerator.Domain.Entities
-Namespace EnvelopeGenerator.Domain.Entities
- '''
- ''' Handles the combination of the envelope and receiver for common services and submodules as a view model.
- '''
- Public Class ReceiverVM
- Inherits EnvelopeReceiver
+'''
+''' Handles the combination of the envelope and receiver for common services and submodules as a view model.
+'''
+Public Class ReceiverVM
+ Inherits EnvelopeReceiver
- Private ReadOnly Property SReceiver As Receiver
- Get
- If Receiver Is Nothing Then
- Receiver = New Receiver()
- End If
- Return Receiver
- End Get
- End Property
+ Public Shared Function From(source As EnvelopeReceiver) As ReceiverVM
+ Return New ReceiverVM() With {
+ .EnvelopeId = source.EnvelopeId,
+ .ReceiverId = source.ReceiverId,
+ .Sequence = source.Sequence,
+ .Name = source.Name,
+ .JobTitle = source.JobTitle,
+ .CompanyName = source.CompanyName,
+ .PrivateMessage = source.PrivateMessage,
+ .AccessCode = source.AccessCode,
+ .AddedWhen = source.AddedWhen,
+ .ChangedWhen = source.ChangedWhen,
+ .PhoneNumber = source.PhoneNumber,
+ .Company = source.Company,
+ .Status = source.Status,
+ .Envelope = source.Envelope,
+ .Receiver = source.Receiver
+ }
+ End Function
- Public Property Id As Integer
- Get
- Return SReceiver.Id
- End Get
- Set(value As Integer)
- SReceiver.Id = value
- End Set
- End Property
+ Private ReadOnly Property SReceiver As Receiver
+ Get
+ If Receiver Is Nothing Then
+ Receiver = New Receiver()
+ End If
+ Return Receiver
+ End Get
+ End Property
- Public Property EmailAddress As String
- Get
- Return SReceiver.EmailAddress
- End Get
- Set(value As String)
- SReceiver.EmailAddress = value
- End Set
- End Property
+ Public Property Id As Integer
+ Get
+ Return SReceiver.Id
+ End Get
+ Set(value As Integer)
+ SReceiver.Id = value
+ End Set
+ End Property
- Public Property Signature As String
- Get
- Return SReceiver.Signature
- End Get
- Set(value As String)
- SReceiver.Signature = value
- End Set
- End Property
+ Public Property EmailAddress As String
+ Get
+ Return SReceiver.EmailAddress
+ End Get
+ Set(value As String)
+ SReceiver.EmailAddress = value
+ End Set
+ End Property
- Public Property AddedWhen As DateTime
- Get
- Return SReceiver.AddedWhen
- End Get
- Set(value As DateTime)
- SReceiver.AddedWhen = value
- End Set
- End Property
+ Public Property Signature As String
+ Get
+ Return SReceiver.Signature
+ End Get
+ Set(value As String)
+ SReceiver.Signature = value
+ End Set
+ End Property
- Public Property TotpSecretkey As String
- Get
- Return SReceiver.TotpSecretkey
- End Get
- Set(value As String)
- SReceiver.TotpSecretkey = value
- End Set
- End Property
+ Public Property AddedWhen As DateTime
+ Get
+ Return SReceiver.AddedWhen
+ End Get
+ Set(value As DateTime)
+ SReceiver.AddedWhen = value
+ End Set
+ End Property
- Public Property TfaRegDeadline As DateTime?
- Get
- Return SReceiver.TfaRegDeadline
- End Get
- Set(value As DateTime?)
- SReceiver.TfaRegDeadline = value
- End Set
- End Property
+ Public Property TotpSecretkey As String
+ Get
+ Return SReceiver.TotpSecretkey
+ End Get
+ Set(value As String)
+ SReceiver.TotpSecretkey = value
+ End Set
+ End Property
+
+ Public Property TfaRegDeadline As DateTime?
+ Get
+ Return SReceiver.TfaRegDeadline
+ End Get
+ Set(value As DateTime?)
+ SReceiver.TfaRegDeadline = value
+ End Set
+ End Property
#Region "Model of old service"
- Public Property SignedDate As DateTime = DateTime.MinValue
+ Public Property SignedDate As DateTime = DateTime.MinValue
- Public Property ColorType As Constants.ColorType
+ Public Property ColorType As Constants.ColorType
- Public ReadOnly Property SignedDateDisplayValue As String
- Get
- If SignedDate = DateTime.MinValue Then
- Return "-"
- Else
- Return SignedDate.ToString("G")
- End If
- End Get
- End Property
+ Public ReadOnly Property SignedDateDisplayValue As String
+ Get
+ If SignedDate = DateTime.MinValue Then
+ Return "-"
+ Else
+ Return SignedDate.ToString("G")
+ End If
+ End Get
+ End Property
- Public ReadOnly Property Color As Color
- Get
- Return ColorType.ToColor()
- End Get
- End Property
+ Public ReadOnly Property Color As Color
+ Get
+ Return ColorType.ToColor()
+ End Get
+ End Property
- Public Function GetSignature() As String
- Return Receiver.GetSignature()
- End Function
+ Public Function GetSignature() As String
+ Return Receiver.GetSignature()
+ End Function
#End Region
- End Class
-
-End Namespace
+End Class
diff --git a/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs b/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs
index e1de9784..68335b6c 100644
--- a/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs
+++ b/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs
@@ -97,7 +97,7 @@ public class EnvelopeController : BaseController
Status = Constants.DocumentStatus.Signed
});
- var signResult = actionService?.SignEnvelope(response.Envelope, response.Receiver);
+ var signResult = actionService?.SignEnvelope(response.Envelope, ReceiverVM.From(response));
return Ok(new object());
}
diff --git a/EnvelopeGenerator.Web/Services/EnvelopeOldService.cs b/EnvelopeGenerator.Web/Services/EnvelopeOldService.cs
index fbb35de6..9c1472bc 100644
--- a/EnvelopeGenerator.Web/Services/EnvelopeOldService.cs
+++ b/EnvelopeGenerator.Web/Services/EnvelopeOldService.cs
@@ -82,7 +82,7 @@ public class EnvelopeOldService
_logger.LogInformation("Envelope receivers found: [{0}]", envelope.Receivers.Count);
- Receiver? receiver = envelope.Receivers.Where(r => r.Id == receiverId).SingleOrDefault();
+ Receiver? receiver = envelope.Receivers.Where(r => r.ReceiverId == receiverId).SingleOrDefault()?.Receiver;
if (receiver == null)
{
diff --git a/EnvelopeGenerator.Web/Views/TestView/DebugEnvelopes.cshtml b/EnvelopeGenerator.Web/Views/TestView/DebugEnvelopes.cshtml
index 96e9df83..d8dc5a09 100644
--- a/EnvelopeGenerator.Web/Views/TestView/DebugEnvelopes.cshtml
+++ b/EnvelopeGenerator.Web/Views/TestView/DebugEnvelopes.cshtml
@@ -9,7 +9,7 @@
string encodeEnvelopeKey(Envelope envelope)
{
var receiver = envelope.Receivers.First();
- return Helpers.EncodeEnvelopeReceiverId(envelope.Uuid, receiver.Signature);
+ return Helpers.EncodeEnvelopeReceiverId(envelope.Uuid, receiver.Receiver.Signature);
}
IEnumerable> groupEnvelopes(List envelopes)