Merge branch 'master' of http://git.dd:3000/AppStd/EnvelopeGenerator

EnvelopeGenerator.Common/Models/BaseModel.vb

@@ -1,6 +1,5 @@
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
-Imports System.Data
 
 Public MustInherit Class BaseModel
     Protected Database As MSSQLServer

EnvelopeGenerator.Common/Models/DocumentModel.vb

@@ -1,8 +1,5 @@
-Imports System.Data
-Imports System.Data.SqlClient
-Imports System.Transactions
+Imports System.Data.SqlClient
 Imports DigitalData.Modules.Base
-Imports EnvelopeGenerator.Common.My.Resources
 
 Public Class DocumentModel
     Inherits BaseModel

EnvelopeGenerator.Common/Models/EnvelopeModel.vb

@@ -6,8 +6,12 @@ Imports DigitalData.Modules.Logging
 Public Class EnvelopeModel
     Inherits BaseModel
 
+    Private UserModel As UserModel
+
     Public Sub New(pState As State)
         MyBase.New(pState)
+
+        UserModel = New UserModel(pState)
     End Sub
 
     Private Function ToEnvelope(pRow As DataRow) As Envelope
@@ -18,12 +22,14 @@ Public Class EnvelopeModel
             .Uuid = pRow.ItemEx("ENVELOPE_UUID", ""),
             .Subject = pRow.ItemEx("SUBJECT", ""),
             .Message = pRow.ItemEx("MESSAGE", ""),
-            .UserId = State.UserId,
+            .UserId = pRow.ItemEx("USER_ID", 0),
             .Status = ObjectEx.ToEnum(Of Constants.EnvelopeStatus)(pRow.ItemEx("STATUS", "Created")),
             .AddedWhen = pRow.Item("ADDED_WHEN"),
             .User = New User()
         }
 
+        oEnvelope.User = UserModel.SelectUser(oEnvelope.UserId)
+
         Return oEnvelope
     End Function
 

EnvelopeGenerator.Common/Models/UserModel.vb

@@ -1,7 +1,5 @@
-Imports System.Data.SqlClient
-Imports DigitalData.Modules.Base
+Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Logging
-Imports EnvelopeGenerator.Common.My.Resources
 
 Public Class UserModel
     Inherits BaseModel
@@ -36,4 +34,17 @@ Public Class UserModel
         End Try
     End Function
 
+    Public Function SelectUser(pUserID As Integer) As User
+        Try
+            Dim oSql = $"SELECT * FROM [dbo].[TBDD_USER] WHERE GUID = {pUserID}"
+            Dim oTable = Database.GetDatatable(oSql)
+
+            Return oTable?.Rows.Cast(Of DataRow).
+                Select(AddressOf ToUser).First
+        Catch ex As Exception
+            Logger.Error(ex)
+            Return Nothing
+        End Try
+    End Function
+
 End Class