From bf84d5c63ad97579eee4a3408966893d215330c8 Mon Sep 17 00:00:00 2001 From: Developer01 Date: Tue, 12 Nov 2024 08:30:14 +0100 Subject: [PATCH] MS Common v1.5.9 email Valdiation, email Resending, Clientintegration --- .../My Project/AssemblyInfo.vb | 4 +-- .../Services/ActionService.vb | 2 +- .../Strings/Envelope.en.resx | 3 ++ .../Strings/Envelope.resx | 3 ++ .../Strings/Envelope1.Designer.vb | 9 ++++++ EnvelopeGenerator.Form/frmEnvelopeEditor.resx | 12 +++---- EnvelopeGenerator.Form/frmEnvelopeEditor.vb | 32 +++++++++++++++---- EnvelopeGenerator.Form/frmMain.vb | 1 + 8 files changed, 50 insertions(+), 16 deletions(-) diff --git a/EnvelopeGenerator.Common/My Project/AssemblyInfo.vb b/EnvelopeGenerator.Common/My Project/AssemblyInfo.vb index d3678d57..ea66036d 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 d22ae95c..b2fc149e 100644 --- a/EnvelopeGenerator.Common/Services/ActionService.vb +++ b/EnvelopeGenerator.Common/Services/ActionService.vb @@ -45,7 +45,7 @@ Public Class ActionService Return oSendResult End Function Public Function ResendReceiver(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean - EmailService.SendDocumentReceivedEmail(pEnvelope, pReceiver) + Return EmailService.SendDocumentReceivedEmail(pEnvelope, pReceiver) End Function diff --git a/EnvelopeGenerator.Common/Strings/Envelope.en.resx b/EnvelopeGenerator.Common/Strings/Envelope.en.resx index 2935748f..1eb26f3b 100644 --- a/EnvelopeGenerator.Common/Strings/Envelope.en.resx +++ b/EnvelopeGenerator.Common/Strings/Envelope.en.resx @@ -168,6 +168,9 @@ Envelope-Editor + + This email could not be validated! + Error sending the envelope: diff --git a/EnvelopeGenerator.Common/Strings/Envelope.resx b/EnvelopeGenerator.Common/Strings/Envelope.resx index e6af1714..1eaecce1 100644 --- a/EnvelopeGenerator.Common/Strings/Envelope.resx +++ b/EnvelopeGenerator.Common/Strings/Envelope.resx @@ -168,6 +168,9 @@ Umschlag-Editor + + Die Email-Adresse konnte nicht validiert werden! + Fehler beim Senden des Umschlags: diff --git a/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb b/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb index bfdf860a..466cb614 100644 --- a/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb +++ b/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb @@ -217,6 +217,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Die Email-Adresse konnte nicht validiert werden! ähnelt. + ''' + Public Shared ReadOnly Property Error_email_Validation() As String + Get + Return ResourceManager.GetString("Error email Validation", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Zeichenfolge, die Fehler beim Senden des Umschlags: ähnelt. ''' diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx index 32e48364..7cf8b4f1 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx @@ -1091,6 +1091,12 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + BarButtonItem4 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPage1 @@ -1289,12 +1295,6 @@ DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - BarButtonItem4 - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - frmEnvelopeEditor diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb index d5808c92..c4a15eaa 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb @@ -543,18 +543,36 @@ Partial Public Class frmEnvelopeEditor Dim oNameCellValue = ViewReceivers.GetRowCellValue(e.RowHandle, COL_NAME) If oNameCellValue Is Nothing Then Dim oEmailAdress As String = DirectCast(e.Value.ToString.ToLower, String) + oEmailAdress = Trim(oEmailAdress) + If IsValidEmailAddress(oEmailAdress) = True Then + Dim oLastName As String = Controller.GetLastNameByEmailAdress(oEmailAdress) + Dim oAccessCode As String = Helpers.GetAccessCode() + ViewReceivers.SetRowCellValue(e.RowHandle, ViewReceivers.Columns.Item(COL_EMAIL), oEmailAdress) + ViewReceivers.SetRowCellValue(e.RowHandle, ViewReceivers.Columns.Item(COL_NAME), oLastName) + ViewReceivers.SetRowCellValue(e.RowHandle, ViewReceivers.Columns.Item(COL_CODE), oAccessCode) + CellValueChanged = False + Else + MsgBox(Resources.Envelope.Error_email_Validation, MsgBoxStyle.Exclamation, Text) + ViewReceivers.SetFocusedValue("") + End If - Dim oLastName As String = Controller.GetLastNameByEmailAdress(oEmailAdress) - Dim oAccessCode As String = Helpers.GetAccessCode() - ViewReceivers.SetRowCellValue(e.RowHandle, ViewReceivers.Columns.Item(COL_EMAIL), oEmailAdress) - ViewReceivers.SetRowCellValue(e.RowHandle, ViewReceivers.Columns.Item(COL_NAME), oLastName) - ViewReceivers.SetRowCellValue(e.RowHandle, ViewReceivers.Columns.Item(COL_CODE), oAccessCode) - CellValueChanged = False End If End If End If End Sub - + Private Function IsValidEmailAddress(pEmailAddress As String) As Boolean + Try + If pEmailAddress.Contains("@") Then + Dim oAddress = New System.Net.Mail.MailAddress(pEmailAddress) + Return oAddress.Address = pEmailAddress + Else + Return False + End If + Catch ex As Exception + Logger.Error(ex) + Return False + End Try + End Function Private Sub RibbonControl1_Click(sender As Object, e As EventArgs) Handles RibbonControl1.Click End Sub diff --git a/EnvelopeGenerator.Form/frmMain.vb b/EnvelopeGenerator.Form/frmMain.vb index 4ca0f99b..b04a7e74 100644 --- a/EnvelopeGenerator.Form/frmMain.vb +++ b/EnvelopeGenerator.Form/frmMain.vb @@ -566,6 +566,7 @@ Public Class frmMain 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