29-11-2023

EnvelopeGenerator.Common/Models/EnvelopeModel.vb

@@ -27,7 +27,7 @@ Public Class EnvelopeModel
             .Subject = pRow.ItemEx("SUBJECT", ""),
             .Message = pRow.ItemEx("MESSAGE", ""),
             .UserId = pRow.ItemEx("USER_ID", 0),
-            .Status = ObjectEx.ToEnum(Of Constants.EnvelopeStatus)(pRow.ItemEx("STATUS", Constants.EnvelopeStatus.Created.ToString())),
+            .Status = ObjectEx.ToEnum(Of Constants.EnvelopeStatus)(pRow.ItemEx("STATUS", Constants.EnvelopeStatus.EnvelopeCreated.ToString())),
             .AddedWhen = pRow.Item("ADDED_WHEN"),
             .User = New User()
         }
@@ -57,6 +57,18 @@ Public Class EnvelopeModel
         End Try
     End Function
 
+    Public Function GetById(pEnvelopeId As String) As Envelope
+        Try
+            Dim oSql = $"SELECT * FROM [dbo].[TBSIG_ENVELOPE] WHERE GUID = '{pEnvelopeId}'"
+            Dim oTable = Database.GetDatatable(oSql)
+
+            Return ToEnvelope(oTable)
+        Catch ex As Exception
+            Logger.Error(ex)
+            Return Nothing
+        End Try
+    End Function
+
     Public Function List() As IEnumerable(Of Envelope)
         Try
             Dim oSql = $"SELECT * FROM [dbo].[TBSIG_ENVELOPE] WHERE USER_ID = {State.UserId} AND STATUS IN (0,1,2,3)"
@@ -102,25 +114,6 @@ Public Class EnvelopeModel
         End Try
     End Function
 
-    Public Function Send(pEnvelope As Envelope) As Boolean
-        Try
-            Dim oSql = "UPDATE [dbo].[TBSIG_ENVELOPE] SET STATUS = @STATUS, SENT_WHEN = GETDATE() WHERE GUID = @GUID"
-            Dim oCommand As New SqlCommand(oSql)
-            oCommand.Parameters.Add("GUID", SqlDbType.Int).Value = pEnvelope.Id
-            oCommand.Parameters.Add("STATUS", SqlDbType.Int).Value = Constants.EnvelopeStatus.Sent
-
-            If Database.ExecuteNonQuery(oCommand) Then
-                Return True
-            Else
-                Return False
-            End If
-
-        Catch ex As Exception
-            Logger.Error(ex)
-            Return False
-        End Try
-    End Function
-
     Public Function Insert(pEnvelope As Envelope) As Boolean
         Try
             Dim oSql = "INSERT INTO [dbo].[TBSIG_ENVELOPE] (SUBJECT, MESSAGE, ENVELOPE_UUID, STATUS, USER_ID, TITLE, CONTRACT_TYPE) "
@@ -129,7 +122,7 @@ Public Class EnvelopeModel
             oCommand.Parameters.Add("SUBJECT", SqlDbType.NVarChar).Value = String.Empty
             oCommand.Parameters.Add("MESSAGE", SqlDbType.NVarChar).Value = String.Empty
             oCommand.Parameters.Add("UUID", SqlDbType.NVarChar).Value = pEnvelope.Uuid
-            oCommand.Parameters.Add("STATUS", SqlDbType.Int).Value = Constants.EnvelopeStatus.Created
+            oCommand.Parameters.Add("STATUS", SqlDbType.Int).Value = Constants.EnvelopeStatus.EnvelopeCreated
             oCommand.Parameters.Add("USER_ID", SqlDbType.Int).Value = pEnvelope.UserId
             oCommand.Parameters.Add("TITLE", SqlDbType.NVarChar).Value = pEnvelope.Title
             oCommand.Parameters.Add("CONTRACT_TYPE", SqlDbType.Int).Value = pEnvelope.ContractType
@@ -179,7 +172,7 @@ Public Class EnvelopeModel
     Public Function Delete(pEnvelope As Envelope, pTransaction As SqlTransaction) As Boolean
         Try
             Dim oSql = $"DELETE FROM [dbo].[TBSIG_ENVELOPE] WHERE GUID = {pEnvelope.Id}"
-            Return Database.ExecuteNonQuery(oSql, pTransaction)
+            'Return Database.ExecuteNonQuery(oSql, pTransaction)
 
         Catch ex As Exception
             Return False

EnvelopeGenerator.Common/Models/HistoryModel.vb

@@ -7,46 +7,24 @@ Public Class HistoryModel
         MyBase.New(pState)
     End Sub
 
-    Private Function GetActionDescription(pActionType As Constants.EnvelopeHistoryActionType)
-        Select Case pActionType
-            Case Constants.EnvelopeHistoryActionType.Created
-                Return "Umschlag erfolgreich erstellt"
-
-            Case Constants.EnvelopeHistoryActionType.Sent
-                Return "Umschlag an Empfänger versendet"
-
-            Case Constants.EnvelopeHistoryActionType.Seen
-                Return "Umschlag von Empfänger geöffnet"
-
-            Case Constants.EnvelopeHistoryActionType.Signed
-                Return "Umschlag von Empfänger signiert"
-
-            Case Else
-                Return pActionType.ToString()
-        End Select
-    End Function
-
     Public Function Insert(pHistory As EnvelopeHistoryEntry) As Boolean
         Try
             Dim oSql = "INSERT INTO [dbo].[TBSIG_ENVELOPE_HISTORY] "
             oSql += "   ([ENVELOPE_ID] "
             oSql += "   ,[USER_REFERENCE] "
-            oSql += "   ,[ACTION_TYPE] "
-            oSql += "   ,[ACTION_DESCRIPTION] "
+            oSql += "   ,[STATUS] "
             oSql += "   ,[ACTION_DATE]) "
             oSql += " VALUES "
             oSql += "   (@ENVELOPE_ID "
             oSql += "   ,@USER_REFERENCE "
-            oSql += "   ,@ACTION_TYPE "
-            oSql += "   ,@ACTION_DESCRIPTION "
+            oSql += "   ,@STATUS "
             oSql += "   ,@ACTION_DATE) "
 
             Dim oCommand As New SqlCommand(oSql)
             oCommand.Parameters.Add("ENVELOPE_ID", SqlDbType.Int).Value = pHistory.EnvelopeId
             oCommand.Parameters.Add("USER_REFERENCE", SqlDbType.NVarChar).Value = pHistory.UserReference
-            oCommand.Parameters.Add("ACTION_TYPE", SqlDbType.Int).Value = pHistory.ActionType
-            oCommand.Parameters.Add("ACTION_DESCRIPTION", SqlDbType.NVarChar).Value = GetActionDescription(pHistory.ActionType)
-            oCommand.Parameters.Add("ACTION_DATE", SqlDbType.DateTime).Value = Now()
+            oCommand.Parameters.Add("STATUS", SqlDbType.Int).Value = pHistory.Status
+            oCommand.Parameters.Add("ACTION_DATE", SqlDbType.DateTime).Value = pHistory.ActionDate
 
             If Database.ExecuteNonQuery(oCommand) Then
                 Return True

EnvelopeGenerator.Common/Models/ReceiverModel.vb

@@ -23,6 +23,12 @@ Public Class ReceiverModel
         }
     End Function
 
+    Private Function ToReceiver(pTable As DataTable) As EnvelopeReceiver
+        Return pTable?.Rows.Cast(Of DataRow).
+            Select(AddressOf ToReceiver).
+            Single()
+    End Function
+
     Public Function TestReceiverExists(pReceiver As EnvelopeReceiver) As Boolean
         Try
             Dim oGuid = Database.GetScalarValue($"SELECT COALESCE(GUID, 0) FROM TBSIG_RECEIVER WHERE EMAIL_ADDRESS = '{pReceiver.Email}'")
@@ -140,13 +146,13 @@ Public Class ReceiverModel
         End Try
     End Function
 
-    Public Function ListReceivers(pExistingReceivers As IEnumerable(Of EnvelopeReceiver)) As IEnumerable(Of EnvelopeReceiver)
+    Public Function ListReceivers(pReceiversFromGrid As List(Of EnvelopeReceiver)) As IEnumerable(Of EnvelopeReceiver)
         Try
-            If pExistingReceivers.Count = 0 Then
+            If pReceiversFromGrid.Count = 0 Then
                 Return New List(Of EnvelopeReceiver)
             End If
 
-            Dim oAddresses = pExistingReceivers.Select(Function(r) $"'{r.Email}'").JoinToString(",")
+            Dim oAddresses = pReceiversFromGrid.Select(Function(r) $"'{r.Email}'").JoinToString(",")
 
             Dim oSql = $"SELECT * FROM [dbo].[TBSIG_RECEIVER] WHERE EMAIL_ADDRESS IN ({oAddresses})"
             Dim oTable = Database.GetDatatable(oSql)
@@ -173,6 +179,19 @@ Public Class ReceiverModel
         End Try
     End Function
 
+    Public Function GetById(pReceiverId As Integer) As EnvelopeReceiver
+        Try
+            Dim oSql = $"SELECT * FROM [dbo].[VWSIG_ENVELOPE_RECEIVERS] WHERE GUID = {pReceiverId}"
+            Dim oTable = Database.GetDatatable(oSql)
+
+            Return ToReceiver(oTable)
+
+        Catch ex As Exception
+            Logger.Error(ex)
+            Return Nothing
+        End Try
+    End Function
+
     Public Function GetReceiverIdBySignature(pSignature As String) As Integer
         Try
             Return Database.GetScalarValue($"SELECT GUID FROM TBSIG_RECEIVER WHERE SIGNATURE = '{pSignature}'")