From d8742332ecf23b14696319624cb902fc7d84a875 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 14 Dec 2023 10:46:27 +0100 Subject: [PATCH] envelope model --- EnvelopeGenerator.Common/Entities/Envelope.vb | 5 +-- .../Models/EnvelopeModel.vb | 36 +++++++++++++++---- 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/EnvelopeGenerator.Common/Entities/Envelope.vb b/EnvelopeGenerator.Common/Entities/Envelope.vb index 424627fc..19648a7b 100644 --- a/EnvelopeGenerator.Common/Entities/Envelope.vb +++ b/EnvelopeGenerator.Common/Entities/Envelope.vb @@ -2,12 +2,13 @@ Public Property Id As Integer = 0 Public Property UserId As Integer Public Property Title As String = "" + Public Property EnvelopeType As Integer Public Property ContractType As Constants.ContractType Public Property Status As Constants.EnvelopeStatus = Constants.EnvelopeStatus.EnvelopeCreated Public Property Uuid As String = Guid.NewGuid.ToString() Public Property UseAccessCode As Boolean = False - Public Property Language As String = Nothing - Public Property CertificationType As Constants.CertificationType + Public Property Language As String = "de-DE" + Public Property CertificationType As Constants.CertificationType = Constants.CertificationType.ElectronicSignature Public Property SendReminderEmails As Boolean = False Public Property FirstReminderDays As Integer = 0 diff --git a/EnvelopeGenerator.Common/Models/EnvelopeModel.vb b/EnvelopeGenerator.Common/Models/EnvelopeModel.vb index aebf6703..d4c1a2ee 100644 --- a/EnvelopeGenerator.Common/Models/EnvelopeModel.vb +++ b/EnvelopeGenerator.Common/Models/EnvelopeModel.vb @@ -25,6 +25,7 @@ Public Class EnvelopeModel Dim oEnvelope = New Envelope() With { .Id = pRow.ItemEx("GUID", 0), .Title = pRow.ItemEx("TITLE", ""), + .EnvelopeType = pRow.ItemEx("ENVELOPE_TYPE", 0), .ContractType = ObjectEx.ToEnum(Of Constants.ContractType)(pRow.ItemEx("CONTRACT_TYPE", Constants.ContractType.Contract.ToString())), .Uuid = pRow.ItemEx("ENVELOPE_UUID", ""), .Message = pRow.ItemEx("MESSAGE", ""), @@ -131,14 +132,15 @@ Public Class EnvelopeModel Public Function Insert(pEnvelope As Envelope) As Boolean Try - Dim oSql = "INSERT INTO [dbo].[TBSIG_ENVELOPE] (MESSAGE, ENVELOPE_UUID, STATUS, USER_ID, TITLE, CONTRACT_TYPE) " - oSql += " VALUES (@MESSAGE, @UUID, @STATUS, @USER_ID, @TITLE, @CONTRACT_TYPE)" + Dim oSql = "INSERT INTO [dbo].[TBSIG_ENVELOPE] (MESSAGE, ENVELOPE_UUID, STATUS, USER_ID, LANGUAGE, CERTIFICATION_TYPE, CONTRACT_TYPE) " + oSql += " VALUES (@MESSAGE, @UUID, @STATUS, @USER_ID, @LANGUAGE, @CERTIFICATION_TYPE, @CONTRACT_TYPE)" Dim oCommand As New SqlCommand(oSql) 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.EnvelopeCreated oCommand.Parameters.Add("USER_ID", SqlDbType.Int).Value = pEnvelope.UserId - oCommand.Parameters.Add("TITLE", SqlDbType.NVarChar).Value = pEnvelope.Title + oCommand.Parameters.Add("LANGUAGE", SqlDbType.NVarChar).Value = pEnvelope.Language + oCommand.Parameters.Add("CERTIFICATION_TYPE", SqlDbType.Int).Value = pEnvelope.CertificationType oCommand.Parameters.Add("CONTRACT_TYPE", SqlDbType.Int).Value = pEnvelope.ContractType If Database.ExecuteNonQuery(oCommand) Then @@ -161,17 +163,39 @@ Public Class EnvelopeModel oSql += " [MESSAGE] = @MESSAGE, " oSql += " [STATUS] = @STATUS, " oSql += " [TITLE] = @TITLE, " + oSql += " [ENVELOPE_TYPE] = @ENVELOPE_TYPE, " oSql += " [CONTRACT_TYPE] = @CONTRACT_TYPE, " + oSql += " [LANGUAGE] = @LANGUAGE, " + oSql += " [CERTIFICATION_TYPE] = @CERTIFICATION_TYPE, " + oSql += " [EXPIRES_DAYS] = @EXPIRES_DAYS, " + oSql += " [EXPIRES_WARNING_DAYS] = @EXPIRES_WARNING_DAYS, " + oSql += " [FIRST_REMINDER_DAYS] = @FIRST_REMINDER_DAYS, " + oSql += " [FINAL_EMAIL_TO_CREATOR] = @FINAL_EMAIL_TO_CREATOR, " + oSql += " [FINAL_EMAIL_TO_RECEIVERS] = @FINAL_EMAIL_TO_RECEIVERS, " + oSql += " [REMINDER_INTERVAL_DAYS] = @REMINDER_INTERVAL_DAYS, " + oSql += " [SEND_REMINDER_EMAILS] = @SEND_REMINDER_EMAILS, " + oSql += " [USE_ACCESS_CODE] = @USE_ACCESS_CODE, " oSql += " [CHANGED_WHEN] = GETDATE() " oSql += " WHERE GUID = @ID AND USER_ID = @USER_ID" + Dim oCommand As New SqlCommand(oSql) + oCommand.Parameters.Add("ID", SqlDbType.Int).Value = pEnvelope.Id + oCommand.Parameters.Add("USER_ID", SqlDbType.Int).Value = pEnvelope.UserId 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("CONTRACT_TYPE", SqlDbType.Int).Value = pEnvelope.ContractType - - oCommand.Parameters.Add("ID", SqlDbType.Int).Value = pEnvelope.Id - oCommand.Parameters.Add("USER_ID", SqlDbType.Int).Value = pEnvelope.UserId + oCommand.Parameters.Add("LANGUAGE", SqlDbType.NVarChar).Value = pEnvelope.Language + oCommand.Parameters.Add("CERTIFICATION_TYPE", SqlDbType.Int).Value = pEnvelope.CertificationType + oCommand.Parameters.Add("EXPIRES_DAYS", SqlDbType.Int).Value = pEnvelope.ExpiresWhenDays + oCommand.Parameters.Add("EXPIRES_WARNING_DAYS", SqlDbType.Int).Value = pEnvelope.ExpiresWarningWhenDays + oCommand.Parameters.Add("FIRST_REMINDER_DAYS", SqlDbType.Int).Value = pEnvelope.FirstReminderDays + oCommand.Parameters.Add("FINAL_EMAIL_TO_CREATOR", SqlDbType.Int).Value = pEnvelope.FinalEmailToCreator + oCommand.Parameters.Add("FINAL_EMAIL_TO_RECEIVERS", SqlDbType.Int).Value = pEnvelope.FinalEmailToReceivers + oCommand.Parameters.Add("REMINDER_INTERVAL_DAYS", SqlDbType.Int).Value = pEnvelope.ReminderIntervalDays + oCommand.Parameters.Add("SEND_REMINDER_EMAILS", SqlDbType.Bit).Value = pEnvelope.SendReminderEmails + oCommand.Parameters.Add("USE_ACCESS_CODE", SqlDbType.Bit).Value = pEnvelope.UseAccessCode Return Database.ExecuteNonQuery(oCommand, pTransaction)