06-12-23

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

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

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

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).

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 = ""
         }

EnvelopeGenerator.Common/Strings/Model.Designer.vb

@@ -208,6 +208,33 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die Bestätigung versendet ähnelt.
+        '''</summary>
+        Friend Shared ReadOnly Property MessageConfirmationSent() As String
+            Get
+                Return ResourceManager.GetString("MessageConfirmationSent", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die Löschinformation versendet ähnelt.
+        '''</summary>
+        Friend Shared ReadOnly Property MessageDeletionSent() As String
+            Get
+                Return ResourceManager.GetString("MessageDeletionSent", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die Einladung versendet ähnelt.
+        '''</summary>
+        Friend Shared ReadOnly Property MessageInvitationSent() As String
+            Get
+                Return ResourceManager.GetString("MessageInvitationSent", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Zeichenfolge, die Teil-Signiert ähnelt.
         '''</summary>

EnvelopeGenerator.Common/Strings/Model.en.resx

@@ -162,6 +162,15 @@
   <data name="EnvelopeTransmittedDMS" xml:space="preserve">
     <value>DMS</value>
   </data>
+  <data name="MessageConfirmationSent" xml:space="preserve">
+    <value>Confirmation Sent</value>
+  </data>
+  <data name="MessageDeletionSent" xml:space="preserve">
+    <value>Deletion Notice Sent</value>
+  </data>
+  <data name="MessageInvitationSent" xml:space="preserve">
+    <value>Invitation Sent</value>
+  </data>
   <data name="ReadAndSign" xml:space="preserve">
     <value>ReadAndSign</value>
   </data>

EnvelopeGenerator.Common/Strings/Model.resx

@@ -165,6 +165,15 @@
   <data name="EnvelopeTransmittedDMS" xml:space="preserve">
     <value>DMS</value>
   </data>
+  <data name="MessageConfirmationSent" xml:space="preserve">
+    <value>Bestätigung versendet</value>
+  </data>
+  <data name="MessageDeletionSent" xml:space="preserve">
+    <value>Löschinformation versendet</value>
+  </data>
+  <data name="MessageInvitationSent" xml:space="preserve">
+    <value>Einladung versendet</value>
+  </data>
   <data name="PartlySigned" xml:space="preserve">
     <value>Teil-Signiert</value>
   </data>