From fe9c5d048fc592ee10c41a5157fa64d23d0b42a7 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 6 Dec 2023 16:57:53 +0100 Subject: [PATCH] 06-12-23 --- EnvelopeGenerator.Common/Constants.vb | 4 ++- .../Entities/EmailData.vb | 4 ++- EnvelopeGenerator.Common/Models/EmailModel.vb | 2 +- .../Models/HistoryModel.vb | 2 +- .../Services/EmailService.vb | 6 ++--- .../Strings/Model.Designer.vb | 27 +++++++++++++++++++ .../Strings/Model.en.resx | 9 +++++++ EnvelopeGenerator.Common/Strings/Model.resx | 9 +++++++ 8 files changed, 56 insertions(+), 7 deletions(-) diff --git a/EnvelopeGenerator.Common/Constants.vb b/EnvelopeGenerator.Common/Constants.vb index 4605b46c..f911c437 100644 --- a/EnvelopeGenerator.Common/Constants.vb +++ b/EnvelopeGenerator.Common/Constants.vb @@ -15,7 +15,9 @@ DocumentOpened = 2001 DocumentSigned = 2002 SignatureConfirmed = 2003 - TriggerInvitationSent = 3001 ' Wird von Trigger verwendet + MessageInvitationSent = 3001 ' Wird von Trigger verwendet + MessageConfirmationSent = 3002 + MessageDeletionSent = 3003 End Enum Public Enum ElementStatus diff --git a/EnvelopeGenerator.Common/Entities/EmailData.vb b/EnvelopeGenerator.Common/Entities/EmailData.vb index 8f8d6c47..2eae980b 100644 --- a/EnvelopeGenerator.Common/Entities/EmailData.vb +++ b/EnvelopeGenerator.Common/Entities/EmailData.vb @@ -3,6 +3,7 @@ Public Class EmailData Public Property EmailAdress As String Public Property EmailSubject As String Public Property EmailBody As String + Public Property EmailType As Constants.EnvelopeStatus Public Property ReferenceID As Integer Public Property ReferenceString As String @@ -14,9 +15,10 @@ Public Class EmailData Public Property Message As String Public Property EnvelopeTitle As String - Public Sub New(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) + Public Sub New(pEnvelope As Envelope, pReceiver As EnvelopeReceiver, pStatus As Constants.EnvelopeStatus) EmailAdress = pReceiver.Email EmailSubject = String.Empty + EmailType = pStatus Message = pEnvelope.Message ReferenceID = pEnvelope.Id ReferenceString = pEnvelope.Uuid diff --git a/EnvelopeGenerator.Common/Models/EmailModel.vb b/EnvelopeGenerator.Common/Models/EmailModel.vb index bd8417a0..bb1dbe51 100644 --- a/EnvelopeGenerator.Common/Models/EmailModel.vb +++ b/EnvelopeGenerator.Common/Models/EmailModel.vb @@ -23,7 +23,7 @@ Public Class EmailModel oCommand.Parameters.Add("REFERENCE_ID", SqlDbType.Int).Value = pEmail.ReferenceID oCommand.Parameters.Add("REFERENCE_STRING", SqlDbType.NVarChar).Value = pEmail.ReferenceString oCommand.Parameters.Add("REMINDER_TYPE_ID", SqlDbType.Int).Value = 202377 - oCommand.Parameters.Add("WF_ID", SqlDbType.Int).Value = 202377 ' Wegen DB-Trigger MUSS dieser Wert gesetzt werden + oCommand.Parameters.Add("WF_ID", SqlDbType.Int).Value = pEmail.EmailType ' Wegen DB-Trigger MUSS dieser Wert gesetzt werden If Database.ExecuteNonQuery(oCommand) Then Return True diff --git a/EnvelopeGenerator.Common/Models/HistoryModel.vb b/EnvelopeGenerator.Common/Models/HistoryModel.vb index 87e37ebc..5ef61837 100644 --- a/EnvelopeGenerator.Common/Models/HistoryModel.vb +++ b/EnvelopeGenerator.Common/Models/HistoryModel.vb @@ -18,7 +18,7 @@ Public Class HistoryModel End Function Public Function List(pEnvelopeId As Integer) As List(Of EnvelopeHistoryEntry) - Dim oSql = $"SELECT * FROM TBSIG_ENVELOPE_HISTORY WHERE ENVELOPE_ID = {pEnvelopeId} AND STATUS < 3000 ORDER BY ADDED_WHEN DESC" + Dim oSql = $"SELECT * FROM TBSIG_ENVELOPE_HISTORY WHERE ENVELOPE_ID = {pEnvelopeId} ORDER BY ADDED_WHEN DESC" Dim oTable = Database.GetDatatable(oSql) Return oTable?.Rows. Cast(Of DataRow). diff --git a/EnvelopeGenerator.Common/Services/EmailService.vb b/EnvelopeGenerator.Common/Services/EmailService.vb index 46cc95c2..e57562ed 100644 --- a/EnvelopeGenerator.Common/Services/EmailService.vb +++ b/EnvelopeGenerator.Common/Services/EmailService.vb @@ -24,7 +24,7 @@ Public Class EmailService End Sub Public Function SendEnvelopeDeletedEmail(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean - Dim oEmailData As New EmailData(pEnvelope, pReceiver) With + Dim oEmailData As New EmailData(pEnvelope, pReceiver, Constants.EnvelopeStatus.MessageDeletionSent) With { .SignatureLink = "" } @@ -40,7 +40,7 @@ Public Class EmailService End Function Public Function SendDocumentReceivedEmail(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean - Dim oEmailData As New EmailData(pEnvelope, pReceiver) With + Dim oEmailData As New EmailData(pEnvelope, pReceiver, Constants.EnvelopeStatus.MessageInvitationSent) With { .SignatureLink = Helpers.GetEnvelopeURL(State.DbConfig.SignatureHost, pEnvelope.Uuid, pReceiver.Signature) } @@ -56,7 +56,7 @@ Public Class EmailService End Function Public Function SendSignedEmail(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean - Dim oEmailData = New EmailData(pEnvelope, pReceiver) With + Dim oEmailData = New EmailData(pEnvelope, pReceiver, Constants.EnvelopeStatus.MessageConfirmationSent) With { .SignatureLink = "" } diff --git a/EnvelopeGenerator.Common/Strings/Model.Designer.vb b/EnvelopeGenerator.Common/Strings/Model.Designer.vb index cb486028..b6eadb44 100644 --- a/EnvelopeGenerator.Common/Strings/Model.Designer.vb +++ b/EnvelopeGenerator.Common/Strings/Model.Designer.vb @@ -208,6 +208,33 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Bestätigung versendet ähnelt. + ''' + Friend Shared ReadOnly Property MessageConfirmationSent() As String + Get + Return ResourceManager.GetString("MessageConfirmationSent", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Löschinformation versendet ähnelt. + ''' + Friend Shared ReadOnly Property MessageDeletionSent() As String + Get + Return ResourceManager.GetString("MessageDeletionSent", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Einladung versendet ähnelt. + ''' + Friend Shared ReadOnly Property MessageInvitationSent() As String + Get + Return ResourceManager.GetString("MessageInvitationSent", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Zeichenfolge, die Teil-Signiert ähnelt. ''' diff --git a/EnvelopeGenerator.Common/Strings/Model.en.resx b/EnvelopeGenerator.Common/Strings/Model.en.resx index 4acb3a95..d6f080a8 100644 --- a/EnvelopeGenerator.Common/Strings/Model.en.resx +++ b/EnvelopeGenerator.Common/Strings/Model.en.resx @@ -162,6 +162,15 @@ DMS + + Confirmation Sent + + + Deletion Notice Sent + + + Invitation Sent + ReadAndSign diff --git a/EnvelopeGenerator.Common/Strings/Model.resx b/EnvelopeGenerator.Common/Strings/Model.resx index 1cb6d2ac..31532794 100644 --- a/EnvelopeGenerator.Common/Strings/Model.resx +++ b/EnvelopeGenerator.Common/Strings/Model.resx @@ -165,6 +165,15 @@ DMS + + Bestätigung versendet + + + Löschinformation versendet + + + Einladung versendet + Teil-Signiert