feat(Receiver): Entsprechend aktualisiert, um die Eigenschaften der Formularanwendung einzubeziehen
This commit is contained in:
@@ -91,12 +91,12 @@ Public Class EnvelopeEditorController
|
||||
|
||||
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)
|
||||
Dim oExistingAddresses = oExistingReceivers.Select(Function(r) r.EmailAddress)
|
||||
Logger.Debug($"oExistingReceivers.count: {oExistingReceivers.Count}")
|
||||
Logger.Debug($"oExistingAddresses.count: {oExistingAddresses.Count}")
|
||||
Dim oNewReceivers = pReceiversFromGrid.Where(Function(r)
|
||||
If r.Email Is Nothing Then Return False
|
||||
Return Not oExistingAddresses.Contains(r.Email)
|
||||
If r.EmailAddress Is Nothing Then Return False
|
||||
Return Not oExistingAddresses.Contains(r.EmailAddress)
|
||||
End Function).ToList()
|
||||
Logger.Debug($"oNewReceivers.count: {oNewReceivers.Count}")
|
||||
If CreateNewReceivers(oNewReceivers) = False Then
|
||||
@@ -108,10 +108,10 @@ Public Class EnvelopeEditorController
|
||||
pEnvelope.Receivers.Clear()
|
||||
|
||||
For Each oReceiver In pReceiversFromGrid
|
||||
If oReceiver.Email Is Nothing Then Continue For
|
||||
If oReceiver.EmailAddress Is Nothing Then Continue For
|
||||
If oReceiver.Name Is Nothing Then Continue For
|
||||
|
||||
Dim oDbReceiver = oAllReceivers.Where(Function(r) r.Email = oReceiver.Email).SingleOrDefault()
|
||||
Dim oDbReceiver = oAllReceivers.Where(Function(r) r.EmailAddress = oReceiver.EmailAddress).SingleOrDefault()
|
||||
If oDbReceiver IsNot Nothing Then
|
||||
oReceiver.Id = oDbReceiver.Id
|
||||
oReceiver.Signature = oDbReceiver.Signature
|
||||
|
||||
@@ -318,7 +318,7 @@ Partial Public Class frmEnvelopeEditor
|
||||
Me.txtCreatorEmailLabel.ImageOptions.SvgImage = CType(resources.GetObject("txtCreatorEmailLabel.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
|
||||
Me.txtCreatorEmailLabel.Name = "txtCreatorEmailLabel"
|
||||
Me.txtCreatorEmailLabel.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
|
||||
Me.txtCreatorEmailLabel.Tag = "Absender Email: {0}"
|
||||
Me.txtCreatorEmailLabel.Tag = "Absender EmailAddress: {0}"
|
||||
'
|
||||
'txtEnvelopeIdLabel2
|
||||
'
|
||||
@@ -526,7 +526,7 @@ Partial Public Class frmEnvelopeEditor
|
||||
'colEmail
|
||||
'
|
||||
Me.colEmail.ColumnEdit = Me.RepositoryItemComboBox1
|
||||
Me.colEmail.FieldName = "Email"
|
||||
Me.colEmail.FieldName = "EmailAddress"
|
||||
Me.colEmail.Name = "colEmail"
|
||||
Me.colEmail.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.[False]
|
||||
resources.ApplyResources(Me.colEmail, "colEmail")
|
||||
|
||||
@@ -25,7 +25,7 @@ Partial Public Class frmEnvelopeEditor
|
||||
Private Logger As Logger
|
||||
|
||||
Private Const COL_NAME = "Name"
|
||||
Private Const COL_EMAIL = "Email"
|
||||
Private Const COL_EMAIL = "EmailAddress"
|
||||
Private Const COL_CODE = "AccessCode"
|
||||
Private Const COL_PHONE = "PhoneNumber"
|
||||
Public Property State As State
|
||||
@@ -306,7 +306,7 @@ Partial Public Class frmEnvelopeEditor
|
||||
End If
|
||||
|
||||
For Each Receiver In Receivers
|
||||
If Helpers.IsValidEmailAddress(Receiver.Email) = False Then
|
||||
If Helpers.IsValidEmailAddress(Receiver.EmailAddress) = False Then
|
||||
oErrors.Add(String.Format(Resources.Envelope.Invalid_Email_Address, Receiver.Name))
|
||||
End If
|
||||
Next
|
||||
|
||||
4
EnvelopeGenerator.Form/frmMain.Designer.vb
generated
4
EnvelopeGenerator.Form/frmMain.Designer.vb
generated
@@ -231,7 +231,7 @@ Partial Class frmMain
|
||||
'ColEmail
|
||||
'
|
||||
resources.ApplyResources(Me.ColEmail, "ColEmail")
|
||||
Me.ColEmail.FieldName = "Email"
|
||||
Me.ColEmail.FieldName = "EmailAddress"
|
||||
Me.ColEmail.Name = "ColEmail"
|
||||
Me.ColEmail.OptionsColumn.AllowEdit = False
|
||||
'
|
||||
@@ -618,7 +618,7 @@ Partial Class frmMain
|
||||
'ColEmailCompleted
|
||||
'
|
||||
resources.ApplyResources(Me.ColEmailCompleted, "ColEmailCompleted")
|
||||
Me.ColEmailCompleted.FieldName = "Email"
|
||||
Me.ColEmailCompleted.FieldName = "EmailAddress"
|
||||
Me.ColEmailCompleted.Name = "ColEmailCompleted"
|
||||
'
|
||||
'ColSignedDateCompleted
|
||||
|
||||
@@ -386,7 +386,7 @@ Public Class frmMain
|
||||
If oView.Name = ViewReceivers.Name Then
|
||||
Dim oReceiver As Receiver = oView.GetRow(oView.FocusedRowHandle)
|
||||
Dim oEnvelopeTitle As String = Net.WebUtility.UrlEncode(oEnvelope.Title)
|
||||
Process.Start($"mailto:{oReceiver.Email}?subject={oEnvelopeTitle}")
|
||||
Process.Start($"mailto:{oReceiver.EmailAddress}?subject={oEnvelopeTitle}")
|
||||
Else
|
||||
MsgBox(Resources.Envelope.Please_select_a_recipient_from_the_Recipients_tab, MsgBoxStyle.Information, Text)
|
||||
End If
|
||||
@@ -571,7 +571,7 @@ Public Class frmMain
|
||||
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 &
|
||||
$"Envelope-ID:{oEnvelope.Id}" & vbCrLf & $"Receiver: {oReceiver.Email}" & vbCrLf & "Issue/Description: Please describe the issue in Your own words...")
|
||||
$"Envelope-ID:{oEnvelope.Id}" & vbCrLf & $"Receiver: {oReceiver.EmailAddress}" & vbCrLf & "Issue/Description: Please describe the issue in Your own words...")
|
||||
|
||||
Dim mailtoUri As String = $"{mailto}?subject={subject}&body={body}"
|
||||
|
||||
@@ -611,9 +611,9 @@ Public Class frmMain
|
||||
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 oReceiver.EmailAddress = selReceiver.EmailAddress Then
|
||||
If oController.ActionService.ResendReceiver(oEnvelope, oReceiver) = True Then
|
||||
Dim oMsg = Resources.Envelope.Invitation_successfully_resend.Replace("@Mail", oReceiver.Email)
|
||||
Dim oMsg = Resources.Envelope.Invitation_successfully_resend.Replace("@Mail", oReceiver.EmailAddress)
|
||||
MsgBox(oMsg, MsgBoxStyle.Information, Text)
|
||||
|
||||
End If
|
||||
@@ -781,12 +781,12 @@ Public Class frmMain
|
||||
If oView.Name = ViewReceivers.Name Then
|
||||
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}'")
|
||||
Dim oDT As DataTable = DB_DD_ECM.GetDatatable($"SELECT * FROM TBSIG_RECEIVER WHERE EMAIL_ADDRESS = '{oReceiver.EmailAddress}'")
|
||||
If Not IsNothing(oDT) Then
|
||||
If oDT.Rows.Count = 1 Then
|
||||
Dim oTFA_REG_DL = oDT.Rows(0).Item("TFA_REG_DEADLINE")
|
||||
Dim oTOTP = oDT.Rows(0).Item("TOTP_SECRET_KEY")
|
||||
Dim oForm As New frm2Factor_Properties(oReceiver.Email, oTOTP, oTFA_REG_DL, DB_DD_ECM)
|
||||
Dim oForm As New frm2Factor_Properties(oReceiver.EmailAddress, oTOTP, oTFA_REG_DL, DB_DD_ECM)
|
||||
oForm.ShowDialog()
|
||||
End If
|
||||
End If
|
||||
|
||||
Reference in New Issue
Block a user