diff --git a/EnvelopeGenerator.Common/Entities/EmailData.vb b/EnvelopeGenerator.Common/Entities/EmailData.vb
index 8b9109a8..f8d2c960 100644
--- a/EnvelopeGenerator.Common/Entities/EmailData.vb
+++ b/EnvelopeGenerator.Common/Entities/EmailData.vb
@@ -27,7 +27,7 @@ Public Class EmailData
'''
'''
'''
- Public Sub New(pEnvelope As Envelope, pReceiver As EnvelopeReceiver, pStatus As Constants.EnvelopeStatus)
+ Public Sub New(pEnvelope As Envelope, pReceiver As Receiver, pStatus As Constants.EnvelopeStatus)
EmailAdress = pReceiver.Email
EmailSubject = String.Empty
EmailType = pStatus
diff --git a/EnvelopeGenerator.Common/Entities/Envelope.vb b/EnvelopeGenerator.Common/Entities/Envelope.vb
index f5cb0376..735d0cd8 100644
--- a/EnvelopeGenerator.Common/Entities/Envelope.vb
+++ b/EnvelopeGenerator.Common/Entities/Envelope.vb
@@ -32,7 +32,7 @@ Public Class Envelope
Public Property User As New User()
Public Property Documents As New List(Of EnvelopeDocument)
- Public Property Receivers As New List(Of EnvelopeReceiver)
+ Public Property Receivers As New List(Of Receiver)
Public Property History As New List(Of EnvelopeHistoryEntry)
Public Property EnvelopeType As EnvelopeType
Public Property DOC_RESULT As Byte()
diff --git a/EnvelopeGenerator.Common/Entities/EnvelopeResponse.vb b/EnvelopeGenerator.Common/Entities/EnvelopeResponse.vb
index 9760c83c..2a2a74be 100644
--- a/EnvelopeGenerator.Common/Entities/EnvelopeResponse.vb
+++ b/EnvelopeGenerator.Common/Entities/EnvelopeResponse.vb
@@ -1,4 +1,4 @@
Public Class EnvelopeResponse
Public Property Envelope As Envelope
- Public Property Receiver As EnvelopeReceiver
+ Public Property Receiver As Receiver
End Class
diff --git a/EnvelopeGenerator.Common/Entities/EnvelopeReceiver.vb b/EnvelopeGenerator.Common/Entities/Receiver.vb
similarity index 74%
rename from EnvelopeGenerator.Common/Entities/EnvelopeReceiver.vb
rename to EnvelopeGenerator.Common/Entities/Receiver.vb
index e9a5f702..9252971b 100644
--- a/EnvelopeGenerator.Common/Entities/EnvelopeReceiver.vb
+++ b/EnvelopeGenerator.Common/Entities/Receiver.vb
@@ -4,9 +4,8 @@ Imports DigitalData.Modules.Base
Imports EnvelopeGenerator.Domain.Constants
Imports Newtonsoft.Json
-Public Class EnvelopeReceiver
+Public Class Receiver
Public Property Id As Integer = 0
- Public Property UserId As Integer
Public Property Signature As String
Public ReadOnly Property Color As Color
Get
@@ -14,18 +13,6 @@ Public Class EnvelopeReceiver
End Get
End Property
-
- Public ReadOnly Property Image As SvgBitmap
- Get
- Try
- Return SvgBitmap.FromFile("Images/circle.svg")
- Catch ex As Exception
- Return Nothing
- End Try
- End Get
- End Property
-
-
Public Property ColorType As ColorType
Public Property Name As String
@@ -38,13 +25,6 @@ Public Class EnvelopeReceiver
Public Property Status As ReceiverStatus
- Public ReadOnly Property StatusTranslated As String
- Get
- Dim oStatus = Status.ToString()
- Return My.Resources.Model.ResourceManager.GetString(oStatus)
- End Get
- End Property
-
Public Property SignedDate As DateTime = DateTime.MinValue
Public ReadOnly Property SignedDateDisplayValue As String
diff --git a/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj b/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj
index 9a51252d..39a59c19 100644
--- a/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj
+++ b/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj
@@ -284,7 +284,7 @@
-
+
diff --git a/EnvelopeGenerator.Common/Models/ReceiverModel.vb b/EnvelopeGenerator.Common/Models/ReceiverModel.vb
index 9f34f261..3e8e3841 100644
--- a/EnvelopeGenerator.Common/Models/ReceiverModel.vb
+++ b/EnvelopeGenerator.Common/Models/ReceiverModel.vb
@@ -11,7 +11,7 @@ Public Class ReceiverModel
MyBase.New(pState)
End Sub
- Private Function ToReceiver(pRow As DataRow, pColorIndex As Integer) As EnvelopeReceiver
+ Private Function ToReceiver(pRow As DataRow, pColorIndex As Integer) As Receiver
Dim EmailAdress As String = pRow.ItemEx("EMAIL_ADDRESS", "")
Dim EnvelopeId As Integer = pRow.ItemEx("ENVELOPE_ID", 0)
Dim SignedDate As DateTime = DateTime.MinValue
@@ -24,7 +24,7 @@ Public Class ReceiverModel
End If
End If
- Return New EnvelopeReceiver() With {
+ Return New Receiver() With {
.Id = pRow.ItemEx("GUID", 0),
.Email = pRow.ItemEx("EMAIL_ADDRESS", ""),
.Name = pRow.ItemEx("NAME", ""),
@@ -38,13 +38,13 @@ Public Class ReceiverModel
}
End Function
- Private Function ToReceiver(pTable As DataTable) As EnvelopeReceiver
+ Private Function ToReceiver(pTable As DataTable) As Receiver
Return pTable?.Rows.Cast(Of DataRow).
Select(AddressOf ToReceiver).
Single()
End Function
- Public Function TestReceiverExists(pReceiver As EnvelopeReceiver) As Boolean
+ Public Function TestReceiverExists(pReceiver As Receiver) As Boolean
Try
Dim oGuid = Database.GetScalarValue($"SELECT COALESCE(GUID, 0) FROM TBSIG_RECEIVER WHERE EMAIL_ADDRESS = '{pReceiver.Email}'")
pReceiver.Id = oGuid
@@ -55,7 +55,7 @@ Public Class ReceiverModel
End Try
End Function
- Public Function Insert(pReceiver As EnvelopeReceiver, pTransaction As SqlTransaction) As Boolean
+ Public Function Insert(pReceiver As Receiver, pTransaction As SqlTransaction) As Boolean
Try
Dim oSignature As String = pReceiver.GetSignature()
Dim oCheck = $"SELECT COUNT(GUID) FROM [dbo].[TBSIG_RECEIVER] WHERE SIGNATURE = '{oSignature}'"
@@ -87,7 +87,7 @@ Public Class ReceiverModel
End Try
End Function
- Public Function Update(pReceiver As EnvelopeReceiver, pTransaction As SqlTransaction) As Boolean
+ Public Function Update(pReceiver As Receiver, pTransaction As SqlTransaction) As Boolean
Try
Dim oSql As String = $"UPDATE [dbo].[TBSIG_USER_RECEIVER]
SET [NAME] = '{pReceiver.Name}'
@@ -118,7 +118,7 @@ Public Class ReceiverModel
End Try
End Function
- Public Function Assign(pEnvelope As Envelope, pReceiver As EnvelopeReceiver, pTransaction As SqlTransaction) As Boolean
+ Public Function Assign(pEnvelope As Envelope, pReceiver As Receiver, pTransaction As SqlTransaction) As Boolean
Dim oSql = $"INSERT INTO [dbo].[TBSIG_ENVELOPE_RECEIVER]
([ENVELOPE_ID]
,[RECEIVER_ID]
@@ -153,7 +153,7 @@ Public Class ReceiverModel
Return Database.ExecuteNonQuery(oCommand, pTransaction)
End Function
- Public Function ListEnvelopeReceivers(pEnvelopeId As Integer) As IEnumerable(Of EnvelopeReceiver)
+ Public Function ListEnvelopeReceivers(pEnvelopeId As Integer) As IEnumerable(Of Receiver)
Try
Dim oSql = $"SELECT * FROM [dbo].[VWSIG_ENVELOPE_RECEIVERS] WHERE ENVELOPE_ID = {pEnvelopeId}"
Dim oTable = Database.GetDatatable(oSql)
@@ -187,7 +187,7 @@ Public Class ReceiverModel
End Try
End Function
- Public Function ListReceivers() As IEnumerable(Of EnvelopeReceiver)
+ Public Function ListReceivers() As IEnumerable(Of Receiver)
Try
Dim oSql = $"SELECT * FROM [dbo].[TBSIG_RECEIVER]"
Dim oTable = Database.GetDatatable(oSql)
@@ -202,10 +202,10 @@ Public Class ReceiverModel
End Try
End Function
- Public Function ListReceivers(pReceiversFromGrid As List(Of EnvelopeReceiver)) As IEnumerable(Of EnvelopeReceiver)
+ Public Function ListReceivers(pReceiversFromGrid As List(Of Receiver)) As IEnumerable(Of Receiver)
Try
If pReceiversFromGrid.Count = 0 Then
- Return New List(Of EnvelopeReceiver)
+ Return New List(Of Receiver)
End If
Dim oAddresses = pReceiversFromGrid.Select(Function(r) $"'{r.Email}'").JoinToString(",")
@@ -235,7 +235,7 @@ Public Class ReceiverModel
End Try
End Function
- Public Function GetById(pReceiverId As Integer) As EnvelopeReceiver
+ Public Function GetById(pReceiverId As Integer) As Receiver
'Try
' Dim oSql = $"SELECT * FROM [dbo].[VWSIG_ENVELOPE_RECEIVERS] WHERE RECEIVER_ID = {pReceiverId}"
' Dim oTable = Database.GetDatatable(oSql)
diff --git a/EnvelopeGenerator.Common/Services/ActionService.vb b/EnvelopeGenerator.Common/Services/ActionService.vb
index 206bd9f4..04a98cc6 100644
--- a/EnvelopeGenerator.Common/Services/ActionService.vb
+++ b/EnvelopeGenerator.Common/Services/ActionService.vb
@@ -56,7 +56,7 @@ Public Class ActionService
Next
Return oSendResult
End Function
- Public Function ResendReceiver(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean
+ Public Function ResendReceiver(pEnvelope As Envelope, pReceiver As Receiver) As Boolean
Return EmailService.SendDocumentReceivedEmail(pEnvelope, pReceiver)
End Function
@@ -86,7 +86,7 @@ Public Class ActionService
End Function
Public Function API_SendWithdrawn_Mails(pEnvelope As Envelope, pReason As String) As Boolean
Dim oSendResult As Boolean = False
- For Each oReceiver As EnvelopeReceiver In pEnvelope.Receivers
+ For Each oReceiver As Receiver In pEnvelope.Receivers
If EmailService.SendEnvelopeDeletedEmail(pEnvelope, oReceiver, pReason) = False Then
Return False
End If
@@ -94,7 +94,7 @@ Public Class ActionService
Return True
End Function
- Public Function OpenEnvelope(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean
+ Public Function OpenEnvelope(pEnvelope As Envelope, pReceiver As Receiver) As Boolean
Dim oUserReference = pReceiver.Email
If HistoryService.SetEnvelopeStatus(pEnvelope, EnvelopeStatus.DocumentOpened, oUserReference) = False Then
@@ -104,7 +104,7 @@ Public Class ActionService
Return True
End Function
- Public Function RequestAccessCode(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean
+ Public Function RequestAccessCode(pEnvelope As Envelope, pReceiver As Receiver) As Boolean
Dim oUserReference = pReceiver.Email
If HistoryService.SetEnvelopeStatus(pEnvelope, EnvelopeStatus.AccessCodeRequested, oUserReference) = False Then
@@ -114,7 +114,7 @@ Public Class ActionService
Return True
End Function
- Public Function EnterCorrectAccessCode(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean
+ Public Function EnterCorrectAccessCode(pEnvelope As Envelope, pReceiver As Receiver) As Boolean
Dim oUserReference = pReceiver.Email
If HistoryService.SetEnvelopeStatus(pEnvelope, EnvelopeStatus.AccessCodeCorrect, oUserReference) = False Then
@@ -124,7 +124,7 @@ Public Class ActionService
Return True
End Function
- Public Function EnterIncorrectAccessCode(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean
+ Public Function EnterIncorrectAccessCode(pEnvelope As Envelope, pReceiver As Receiver) As Boolean
Dim oUserReference = pReceiver.Email
If HistoryService.SetEnvelopeStatus(pEnvelope, EnvelopeStatus.AccessCodeIncorrect, oUserReference) = False Then
@@ -134,7 +134,7 @@ Public Class ActionService
Return True
End Function
- Public Function SignEnvelope(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean
+ Public Function SignEnvelope(pEnvelope As Envelope, pReceiver As Receiver) As Boolean
Dim oUserReference = pReceiver.Email
If HistoryService.SetEnvelopeStatus(pEnvelope, EnvelopeStatus.DocumentSigned, oUserReference) = False Then
@@ -152,7 +152,7 @@ Public Class ActionService
Return True
End Function
- Public Function CompleteEnvelope(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean ', pAttachment As String
+ Public Function CompleteEnvelope(pEnvelope As Envelope, pReceiver As Receiver) As Boolean ', pAttachment As String
If HistoryService.SetEnvelopeStatus(pEnvelope, EnvelopeStatus.MessageCompletionSent, pReceiver.Email) = False Then
Return False
End If
diff --git a/EnvelopeGenerator.Common/Services/EmailService.vb b/EnvelopeGenerator.Common/Services/EmailService.vb
index f2391aee..dad11f46 100644
--- a/EnvelopeGenerator.Common/Services/EmailService.vb
+++ b/EnvelopeGenerator.Common/Services/EmailService.vb
@@ -13,7 +13,7 @@ Public Class EmailService
EmailTemplate = New TemplateService(pState)
End Sub
- Public Function SendEnvelopeDeletedEmail(pEnvelope As Envelope, pReceiver As EnvelopeReceiver, pReason As String) As Boolean
+ Public Function SendEnvelopeDeletedEmail(pEnvelope As Envelope, pReceiver As Receiver, pReason As String) As Boolean
Logger.Debug("SendEnvelopeDeletedEmail - Creating email data object...")
Dim oEmailData As New EmailData(pEnvelope, pReceiver, Domain.Constants.EnvelopeStatus.MessageDeletionSent) With
{
@@ -31,7 +31,7 @@ Public Class EmailService
Return True
End Function
- Public Function SendDocumentReceivedEmail(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean
+ Public Function SendDocumentReceivedEmail(pEnvelope As Envelope, pReceiver As Receiver) As Boolean
Logger.Debug("Creating email data object.")
Dim oEmailData As New EmailData(pEnvelope, pReceiver, Domain.Constants.EnvelopeStatus.MessageInvitationSent) With
{
@@ -49,7 +49,7 @@ Public Class EmailService
Return True
End Function
- Public Function GetReceiverUrl(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As String
+ Public Function GetReceiverUrl(pEnvelope As Envelope, pReceiver As Receiver) As String
Logger.Debug($"State.DbConfig.SignatureHost: {State.DbConfig.SignatureHost}")
Logger.Debug($" pEnvelope.Uuid: {pEnvelope.Uuid}")
Logger.Debug($" pReceiver.Signature: {pReceiver.Signature}")
@@ -62,7 +62,7 @@ Public Class EmailService
End Function
- Public Function SendDocumentAccessCodeReceivedEmail(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean
+ Public Function SendDocumentAccessCodeReceivedEmail(pEnvelope As Envelope, pReceiver As Receiver) As Boolean
Logger.Debug("Creating email data object.")
Logger.Debug($"State.DbConfig.SignatureHost: {State.DbConfig.SignatureHost}")
Logger.Debug($" pEnvelope.Uuid: {pEnvelope.Uuid}")
@@ -83,7 +83,7 @@ Public Class EmailService
Return True
End Function
- Public Function SendSignedEmail(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean
+ Public Function SendSignedEmail(pEnvelope As Envelope, pReceiver As Receiver) As Boolean
Logger.Debug("Creating email data object.")
Dim oEmailData = New EmailData(pEnvelope, pReceiver, Domain.Constants.EnvelopeStatus.MessageConfirmationSent) With
{
@@ -100,7 +100,7 @@ Public Class EmailService
Return True
End Function
- Public Function SendDocumentCompletedEmailToReceiver(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean ', pAttachment As String
+ Public Function SendDocumentCompletedEmailToReceiver(pEnvelope As Envelope, pReceiver As Receiver) As Boolean ', pAttachment As String
Logger.Debug("Creating email data object.")
Dim oEmailData = New EmailData(pEnvelope, pReceiver, Domain.Constants.EnvelopeStatus.MessageCompletionSent) With
{
diff --git a/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb b/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb
index 6eced691..692b1792 100644
--- a/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb
+++ b/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb
@@ -42,7 +42,7 @@ Public Class EnvelopeEditorController
Public Function DocumentRotationChanged() As Boolean
Return ActionService.SetStatusDocumentRotationChanged(Envelope)
End Function
- Public Function ResendReceiverInvitation(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean
+ Public Function ResendReceiverInvitation(pEnvelope As Envelope, pReceiver As Receiver) As Boolean
Return ActionService.ResendReceiver(pEnvelope, pReceiver)
End Function
@@ -55,7 +55,7 @@ Public Class EnvelopeEditorController
If ElementModel.OneElementPerReceiverExist(Envelope.Id) = False Then
- For Each receiverItem As EnvelopeReceiver In Envelope.Receivers
+ For Each receiverItem As Receiver In Envelope.Receivers
If ElementModel.ElementsExist(Envelope.Id, receiverItem.Id) = False Then
oEnvelopeErrors.Add(String.Format(Resources.Envelope.Missing_Elements_for_Receiver, receiverItem.Name))
End If
@@ -89,8 +89,8 @@ Public Class EnvelopeEditorController
End If
End Function
- Public Function SaveReceivers(pEnvelope As Envelope, pReceiversFromGrid As List(Of EnvelopeReceiver)) As Boolean
- Dim oExistingReceivers As List(Of EnvelopeReceiver) = ReceiverModel.ListReceivers(pReceiversFromGrid).ToList()
+ Public Function SaveReceivers(pEnvelope As Envelope, pReceiversFromGrid As List(Of Receiver)) As Boolean
+ Dim oExistingReceivers As List(Of Receiver) = ReceiverModel.ListReceivers(pReceiversFromGrid).ToList()
Dim oExistingAddresses = oExistingReceivers.Select(Function(r) r.Email)
Logger.Debug($"oExistingReceivers.count: {oExistingReceivers.Count}")
Logger.Debug($"oExistingAddresses.count: {oExistingAddresses.Count}")
@@ -103,7 +103,7 @@ Public Class EnvelopeEditorController
Return False
End If
- Dim oAllReceivers As List(Of EnvelopeReceiver) = ReceiverModel.ListReceivers(pReceiversFromGrid).ToList()
+ Dim oAllReceivers As List(Of Receiver) = ReceiverModel.ListReceivers(pReceiversFromGrid).ToList()
pEnvelope.Receivers.Clear()
@@ -276,7 +276,7 @@ Public Class EnvelopeEditorController
Return ReceiverModel.ListAllEnvelopeReceiverAddresses(pUserId)
End Function
- Public Function CreateNewReceivers(pNewReceivers As List(Of EnvelopeReceiver)) As Boolean
+ Public Function CreateNewReceivers(pNewReceivers As List(Of Receiver)) As Boolean
If pNewReceivers.Count = 0 Then
Return True
End If
@@ -350,7 +350,7 @@ Public Class EnvelopeEditorController
End Try
End Function
- Public Function DeleteReceiver(pReceiver As EnvelopeReceiver) As Boolean
+ Public Function DeleteReceiver(pReceiver As Receiver) As Boolean
Dim oConnection As SqlConnection = Database.GetConnection()
Dim oTransaction As SqlTransaction = oConnection.BeginTransaction()
@@ -381,7 +381,7 @@ Public Class EnvelopeEditorController
Return ElementModel.ElementsExist(Envelope.Id, pReceiverId)
End Function
- Private Function InsertReceivers(pReceivers As List(Of EnvelopeReceiver), pTransaction As SqlTransaction) As Boolean
+ Private Function InsertReceivers(pReceivers As List(Of Receiver), pTransaction As SqlTransaction) As Boolean
Try
Return pReceivers.
Select(Function(r) InsertReceiver(r, pTransaction)).
@@ -404,7 +404,7 @@ Public Class EnvelopeEditorController
End Function
- Private Function InsertReceiver(pReceiver As EnvelopeReceiver, pTransaction As SqlTransaction) As Boolean
+ Private Function InsertReceiver(pReceiver As Receiver, pTransaction As SqlTransaction) As Boolean
If pReceiver.HasId = False Then
Return ReceiverModel.Insert(pReceiver, pTransaction)
Else
diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
index c4abce28..10eb7528 100644
--- a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
+++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
@@ -17,7 +17,7 @@ Imports EnvelopeGenerator.Domain.Constants
Partial Public Class frmEnvelopeEditor
Public Property Envelope As Envelope
Public Property Documents As New BindingList(Of EnvelopeDocument)
- Public Property Receivers As New BindingList(Of EnvelopeReceiver)
+ Public Property Receivers As New BindingList(Of Receiver)
Private AllReceiverEmails As New List(Of String)
@@ -104,7 +104,7 @@ Partial Public Class frmEnvelopeEditor
Else
Controller = New EnvelopeEditorController(State, Envelope)
Documents = New BindingList(Of EnvelopeDocument)(Controller.Envelope.Documents)
- Receivers = New BindingList(Of EnvelopeReceiver)(Controller.Envelope.Receivers)
+ Receivers = New BindingList(Of Receiver)(Controller.Envelope.Receivers)
For Each docItem As EnvelopeDocument In Documents
If Not File.Exists(docItem.Filepath) Then
@@ -365,7 +365,7 @@ Partial Public Class frmEnvelopeEditor
Exit Sub
End If
- Dim oReceiver As EnvelopeReceiver = ViewReceivers.GetFocusedRow()
+ Dim oReceiver As Receiver = ViewReceivers.GetFocusedRow()
If oReceiver Is Nothing Then
Exit Sub
@@ -458,7 +458,7 @@ Partial Public Class frmEnvelopeEditor
End Sub
Private Sub ViewReceivers_InitNewRow(sender As Object, e As InitNewRowEventArgs) Handles ViewReceivers.InitNewRow
- Dim oReceiver As EnvelopeReceiver = ViewReceivers.GetRow(e.RowHandle)
+ Dim oReceiver As Receiver = ViewReceivers.GetRow(e.RowHandle)
Dim oUsedColors = Receivers.Select(Of Integer)(Function(r) r.ColorType).ToList()
Dim oAllColors = [Enum].GetValues(GetType(Domain.Constants.ColorType)).Cast(Of Integer).ToList()
diff --git a/EnvelopeGenerator.Form/frmFieldEditor.vb b/EnvelopeGenerator.Form/frmFieldEditor.vb
index 745c0ecd..380e3ac6 100644
--- a/EnvelopeGenerator.Form/frmFieldEditor.vb
+++ b/EnvelopeGenerator.Form/frmFieldEditor.vb
@@ -20,8 +20,8 @@ Partial Public Class frmFieldEditor
Private Controller As FieldEditorController
Public Property Document As EnvelopeDocument = Nothing
- Public Property Receivers As List(Of EnvelopeReceiver)
- Public Property SelectedReceiver As EnvelopeReceiver = Nothing
+ Public Property Receivers As List(Of Receiver)
+ Public Property SelectedReceiver As Receiver = Nothing
Private UnsavedChanges As Boolean = False
@@ -107,7 +107,7 @@ Partial Public Class frmFieldEditor
UnsavedChanges = True
End Sub
- Private Function CreateBarItem(pReceiver As EnvelopeReceiver) As BarItem
+ Private Function CreateBarItem(pReceiver As Receiver) As BarItem
Dim oItem = New BarButtonItem(BarManager1, pReceiver.Name)
Dim oBaseCircle As SvgImage = SvgImageCollection1.Item(0)
Dim oColorCircle = Helpers.GetColorCircle(oBaseCircle, pReceiver.Color)
@@ -122,7 +122,7 @@ Partial Public Class frmFieldEditor
Private Sub ReceiverItem_Click(sender As Object, e As ItemClickEventArgs)
Me.SuspendLayout()
- Dim oSelectedReceiver As EnvelopeReceiver = e.Item.Tag
+ Dim oSelectedReceiver As Receiver = e.Item.Tag
Dim oCurrentPage = GDViewer.CurrentPage
Dim oCurrentPosition = GDViewer.GetVScrollBarPosition()
@@ -154,7 +154,7 @@ Partial Public Class frmFieldEditor
Me.ResumeLayout()
End Sub
- Private Sub SetReceiver(pReceiver As EnvelopeReceiver)
+ Private Sub SetReceiver(pReceiver As Receiver)
Dim oBaseCircle As SvgImage = SvgImageCollection1.Item(0)
txtReceiver.Caption = pReceiver.Name
diff --git a/EnvelopeGenerator.Form/frmMain.vb b/EnvelopeGenerator.Form/frmMain.vb
index c2177bb5..9db207d1 100644
--- a/EnvelopeGenerator.Form/frmMain.vb
+++ b/EnvelopeGenerator.Form/frmMain.vb
@@ -318,7 +318,7 @@ Public Class frmMain
End If
Dim oView As GridView = DirectCast(sender, GridView)
- Dim oReceiver As EnvelopeReceiver = oView.GetRow(e.RowHandle)
+ Dim oReceiver As Receiver = oView.GetRow(e.RowHandle)
If (oReceiver Is Nothing) Then
Exit Sub
@@ -352,7 +352,7 @@ Public Class frmMain
End If
Dim oView As GridView = DirectCast(sender, GridView)
- Dim oReceiver As EnvelopeReceiver = oView.GetRow(e.RowHandle)
+ Dim oReceiver As Receiver = oView.GetRow(e.RowHandle)
If (oReceiver Is Nothing) Then
Exit Sub
@@ -384,7 +384,7 @@ Public Class frmMain
Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(ViewEnvelopes.FocusedRowHandle)
Dim oView As GridView = GridEnvelopes.FocusedView
If oView.Name = ViewReceivers.Name Then
- Dim oReceiver As EnvelopeReceiver = oView.GetRow(oView.FocusedRowHandle)
+ Dim oReceiver As Receiver = oView.GetRow(oView.FocusedRowHandle)
Dim oEnvelopeTitle As String = Net.WebUtility.UrlEncode(oEnvelope.Title)
Process.Start($"mailto:{oReceiver.Email}?subject={oEnvelopeTitle}")
Else
@@ -567,7 +567,7 @@ Public Class frmMain
Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(ViewEnvelopes.FocusedRowHandle)
Dim oView As GridView = GridEnvelopes.FocusedView
If oView.Name = ViewReceivers.Name Then
- Dim oReceiver As EnvelopeReceiver = oView.GetRow(oView.FocusedRowHandle)
+ Dim oReceiver As Receiver = oView.GetRow(oView.FocusedRowHandle)
Dim mailto As String = "mailto:support-flow@digitaldata.works"
Dim subject As String = Uri.EscapeDataString("signFLOW - Envelope issue - ID: " & oEnvelope.Id)
Dim body As String = Uri.EscapeDataString($"Dear Digital Data Team," & vbCrLf & "There is an error or misbehavin with following envelope and Receiver:" & vbCrLf &
@@ -595,7 +595,7 @@ Public Class frmMain
Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitm_ResendInvitation.ItemClick
Dim oView As GridView = GridEnvelopes.FocusedView
- Dim selReceiver As EnvelopeReceiver
+ Dim selReceiver As Receiver
If oView.Name = ViewReceivers.Name Then
selReceiver = oView.GetRow(oView.FocusedRowHandle)
Else
@@ -608,9 +608,9 @@ Public Class frmMain
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
+ Dim Receivers As New BindingList(Of Receiver)
+ Receivers = New BindingList(Of Receiver)(oController.Envelope.Receivers)
+ For Each oReceiver As Receiver In Receivers
If oReceiver.Email = selReceiver.Email Then
If oController.ActionService.ResendReceiver(oEnvelope, oReceiver) = True Then
Dim oMsg = Resources.Envelope.Invitation_successfully_resend.Replace("@Mail", oReceiver.Email)
@@ -779,7 +779,7 @@ Public Class frmMain
Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(ViewEnvelopes.FocusedRowHandle)
Dim oView As GridView = GridEnvelopes.FocusedView
If oView.Name = ViewReceivers.Name Then
- Dim oReceiver As EnvelopeReceiver = oView.GetRow(oView.FocusedRowHandle)
+ Dim oReceiver As Receiver = oView.GetRow(oView.FocusedRowHandle)
Dim oEnvelopeTitle As String = Net.WebUtility.UrlEncode(oEnvelope.Title)
Dim oDT As DataTable = DB_DD_ECM.GetDatatable($"SELECT * FROM TBSIG_RECEIVER WHERE EMAIL_ADDRESS = '{oReceiver.Email}'")
If Not IsNothing(oDT) Then
diff --git a/EnvelopeGenerator.Web/Services/EnvelopeOldService.cs b/EnvelopeGenerator.Web/Services/EnvelopeOldService.cs
index 4cd175e2..411b4ff5 100644
--- a/EnvelopeGenerator.Web/Services/EnvelopeOldService.cs
+++ b/EnvelopeGenerator.Web/Services/EnvelopeOldService.cs
@@ -78,7 +78,7 @@ namespace EnvelopeGenerator.Web.Services
_logger.LogInformation("Envelope receivers found: [{0}]", envelope.Receivers.Count);
- EnvelopeReceiver? receiver = envelope.Receivers.Where(r => r.Id == receiverId).SingleOrDefault();
+ Receiver? receiver = envelope.Receivers.Where(r => r.Id == receiverId).SingleOrDefault();
if (receiver == null)
{