12.01.2024

EnvelopeGenerator.Common/Models/EnvelopeModel.vb

@@ -10,7 +10,7 @@ Public Class EnvelopeModel
     Private ReadOnly ReceiverModel As ReceiverModel
     Private ReadOnly HistoryModel As HistoryModel
     Private ReadOnly DocumentModel As DocumentModel
-
+    Private ReadOnly EnvelopeTypeModel As EnvelopeTypeModel
 
     Public Sub New(pState As State)
         MyBase.New(pState)
@@ -19,13 +19,14 @@ Public Class EnvelopeModel
         ReceiverModel = New ReceiverModel(pState)
         DocumentModel = New DocumentModel(pState)
         HistoryModel = New HistoryModel(pState)
+        EnvelopeTypeModel = New EnvelopeTypeModel(pState)
     End Sub
 
     Private Function ToEnvelope(pRow As DataRow) As Envelope
         Dim oEnvelope = New Envelope() With {
             .Id = pRow.ItemEx("GUID", 0),
             .Title = pRow.ItemEx("TITLE", ""),
-            .EnvelopeType = pRow.ItemEx("ENVELOPE_TYPE", 0),
+            .EnvelopeTypeId = pRow.ItemEx("ENVELOPE_TYPE", 0),
             .ContractType = pRow.ItemEx("CONTRACT_TYPE", 0),
             .Uuid = pRow.ItemEx("ENVELOPE_UUID", ""),
             .Message = pRow.ItemEx("MESSAGE", ""),
@@ -51,6 +52,7 @@ Public Class EnvelopeModel
         oEnvelope.Receivers = ReceiverModel.ListEnvelopeReceivers(oEnvelope.Id)
         oEnvelope.Documents = DocumentModel.List(oEnvelope.Id)
         oEnvelope.History = HistoryModel.List(oEnvelope.Id)
+        oEnvelope.EnvelopeType = EnvelopeTypeModel.GetById(oEnvelope.EnvelopeTypeId)
 
         Return oEnvelope
     End Function
@@ -181,7 +183,7 @@ Public Class EnvelopeModel
             oCommand.Parameters.Add("MESSAGE", SqlDbType.NVarChar).Value = pEnvelope.Message
             oCommand.Parameters.Add("STATUS", SqlDbType.Int).Value = pEnvelope.Status
             oCommand.Parameters.Add("TITLE", SqlDbType.NVarChar).Value = pEnvelope.Title
-            oCommand.Parameters.Add("ENVELOPE_TYPE", SqlDbType.Int).Value = pEnvelope.EnvelopeType
+            oCommand.Parameters.Add("ENVELOPE_TYPE", SqlDbType.Int).Value = pEnvelope.EnvelopeTypeId
             oCommand.Parameters.Add("CONTRACT_TYPE", SqlDbType.Int).Value = pEnvelope.ContractType
             oCommand.Parameters.Add("LANGUAGE", SqlDbType.NVarChar).Value = pEnvelope.Language
             oCommand.Parameters.Add("CERTIFICATION_TYPE", SqlDbType.Int).Value = pEnvelope.CertificationType

EnvelopeGenerator.Common/Models/EnvelopeTypeModel.vb

@@ -25,6 +25,18 @@ Public Class EnvelopeTypeModel
         }
     End Function
 
+    Public Function GetById(pEnvelopeTypeId As Integer) As EnvelopeType
+        Dim oSql As String = $"SELECT * FROM TBSIG_ENVELOPE_TYPE WHERE GUID = {pEnvelopeTypeId}"
+        Dim oTable As DataTable = Database.GetDatatable(oSql)
+
+        If oTable.Rows.Count = 0 Then
+            Return Nothing
+        End If
+
+        Dim oRow = oTable.Rows.Item(0)
+        Return ToEnvelopeType(oRow)
+    End Function
+
     Public Function List() As IEnumerable(Of EnvelopeType)
         Dim oSql As String = $"SELECT * FROM TBSIG_ENVELOPE_TYPE"
         Dim oTable As DataTable = Database.GetDatatable(oSql)