diff --git a/EnvelopeGenerator.Common/Constants.vb b/EnvelopeGenerator.Common/Constants.vb deleted file mode 100644 index 7ae9feaa..00000000 --- a/EnvelopeGenerator.Common/Constants.vb +++ /dev/null @@ -1,152 +0,0 @@ -Public Class Constants - -#Region "Status Fields" - 'http://wiki.dd/xwiki13/bin/view/Anwendungen/Produkt-Handbuch/Sonstiges/SignFlow/Envelope%20Status/ - Public Enum EnvelopeStatus - Invalid = 0 - EnvelopeCreated = 1001 - EnvelopeSaved = 1002 - EnvelopeQueued = 1003 - EnvelopeSent = 1004 ' Nicht verwendet - EnvelopePartlySigned = 1005 - EnvelopeCompletelySigned = 1006 - EnvelopeReportCreated = 1007 - EnvelopeArchived = 1008 - EnvelopeDeleted = 1009 - EnvelopeRejected = 10007 - EnvelopeWithdrawn = 10009 - AccessCodeRequested = 2001 - AccessCodeCorrect = 2002 - AccessCodeIncorrect = 2003 - DocumentOpened = 2004 - DocumentSigned = 2005 - DocumentForwarded = 2006 - DocumentRejected = 2007 - EnvelopeShared = 2008 - EnvelopeViewed = 2009 - MessageInvitationSent = 3001 ' Wird von Trigger verwendet - MessageAccessCodeSent = 3002 - MessageConfirmationSent = 3003 - MessageDeletionSent = 3004 - MessageCompletionSent = 3005 - DocumentMod_Rotation = 4001 - End Enum - - Public Class Status - Public Shared ReadOnly NonHist As IReadOnlyList(Of EnvelopeStatus) = New List(Of EnvelopeStatus) From { - EnvelopeStatus.Invalid, - EnvelopeStatus.EnvelopeSaved, - EnvelopeStatus.EnvelopeSent, - EnvelopeStatus.EnvelopePartlySigned - } - - Public Shared ReadOnly RelatedToFormApp As IReadOnlyList(Of EnvelopeStatus) = New List(Of EnvelopeStatus) From { - EnvelopeStatus.EnvelopeCreated, - EnvelopeStatus.DocumentMod_Rotation - } - End Class - - 'TODO: standardize in xwiki - Public Enum ReferenceType - Sender = 1 - Receiver - System - Unknown - End Enum - - Public Enum ElementStatus - Created = 0 - End Enum - - Public Enum DocumentStatus - Created = 0 - Signed = 1 - End Enum - - Public Enum ReceiverStatus - Unsigned = 0 - Signed = 1 - End Enum -#End Region - -#Region "Type Fields" - Public Enum ElementType - Signature = 1 - End Enum - - Public Enum ContractType - Contract = 1 - ReadAndSign = 2 - End Enum - - Public Enum ColorType - ReceiverColor1 = 1 - ReceiverColor2 = 2 - ReceiverColor3 = 3 - ReceiverColor4 = 4 - ReceiverColor5 = 5 - ReceiverColor6 = 6 - ReceiverColor7 = 7 - ReceiverColor8 = 8 - ReceiverColor9 = 9 - ReceiverColor10 = 10 - End Enum - - Public Enum CertificationType - AdvancedElectronicSignature = 1 - 'ElectronicSignature = 1 - 'QualifiedSignature = 2 - End Enum - - Public Enum FinalEmailType - No = 0 - Yes = 1 - YesWithAttachment = 2 - End Enum - - Public Enum PageOrientation - Portrait = 0 - Landscape = 1 - End Enum - - Public Enum EmailTemplateType - DocumentReceived = 0 - DocumentSigned - DocumentDeleted - DocumentCompleted - DocumentAccessCodeReceived - DocumentShared - TotpSecret - DocumentRejected_ADM - DocumentRejected_REC - DocumentRejected_REC_2 - End Enum - - Public Enum EncodeType - EnvelopeReceiver - EnvelopeReceiverReadOnly - Undefined - DocumentForwarded - DocumentShared - End Enum -#End Region - -#Region "Role" - Public NotInheritable Class ReceiverRole - Public Const PreAuth As String = "PreAuth" - Public Const FullyAuth As String = "FullyAuth" - End Class -#End Region - -#Region "Constants" - - Public Const DATABASE = "DATABASE" - Public Const LOGCONFIG = "LOGCONFIG" - Public Const GDPICTURE = "GDPICTURE" - Public Const PDF_BURNER_PARAMS = "PDFBurnerParams" - - Public Const GREEN_300 = "#bbf7d0" - Public Const RED_300 = "#fecaca" - Public Const ORANGE_300 = "#fed7aa" -#End Region -End Class \ No newline at end of file diff --git a/EnvelopeGenerator.Common/Entities/DocumentStatus.vb b/EnvelopeGenerator.Common/Entities/DocumentStatus.vb index 8ed602b9..09740e58 100644 --- a/EnvelopeGenerator.Common/Entities/DocumentStatus.vb +++ b/EnvelopeGenerator.Common/Entities/DocumentStatus.vb @@ -1,4 +1,6 @@ -Public Class DocumentStatus +Imports EnvelopeGenerator.Domain + +Public Class DocumentStatus Public Property Id As Integer Public Property EnvelopeId As Integer diff --git a/EnvelopeGenerator.Common/Entities/ElementStatus.vb b/EnvelopeGenerator.Common/Entities/ElementStatus.vb index c15a89c6..79b67e4e 100644 --- a/EnvelopeGenerator.Common/Entities/ElementStatus.vb +++ b/EnvelopeGenerator.Common/Entities/ElementStatus.vb @@ -1,4 +1,6 @@ -Public Class ElementStatus +Imports EnvelopeGenerator.Domain + +Public Class ElementStatus Public Property Id As Integer Public Property EnvelopeId As Integer diff --git a/EnvelopeGenerator.Common/Entities/EmailData.vb b/EnvelopeGenerator.Common/Entities/EmailData.vb index ed7bd32c..8b9109a8 100644 --- a/EnvelopeGenerator.Common/Entities/EmailData.vb +++ b/EnvelopeGenerator.Common/Entities/EmailData.vb @@ -1,4 +1,4 @@ - +Imports EnvelopeGenerator.Domain Public Class EmailData Public Property EmailAdress As String = "" Public Property EmailSubject As String = "" diff --git a/EnvelopeGenerator.Common/Entities/Envelope.vb b/EnvelopeGenerator.Common/Entities/Envelope.vb index 8cc2cc0f..762f5fbf 100644 --- a/EnvelopeGenerator.Common/Entities/Envelope.vb +++ b/EnvelopeGenerator.Common/Entities/Envelope.vb @@ -1,4 +1,6 @@ -Public Class Envelope +Imports EnvelopeGenerator.Domain + +Public Class Envelope Public Property Id As Integer = 0 Public Property UserId As Integer Public Property Title As String = "" diff --git a/EnvelopeGenerator.Common/Entities/EnvelopeDocumentElement.vb b/EnvelopeGenerator.Common/Entities/EnvelopeDocumentElement.vb index 2642670b..bd908aa4 100644 --- a/EnvelopeGenerator.Common/Entities/EnvelopeDocumentElement.vb +++ b/EnvelopeGenerator.Common/Entities/EnvelopeDocumentElement.vb @@ -1,4 +1,6 @@ -Public Class EnvelopeDocumentElement +Imports EnvelopeGenerator.Domain + +Public Class EnvelopeDocumentElement Public Property Id As Integer = -1 Public Property X As Double Public Property Y As Double diff --git a/EnvelopeGenerator.Common/Entities/EnvelopeHistoryEntry.vb b/EnvelopeGenerator.Common/Entities/EnvelopeHistoryEntry.vb index f144d5a0..1bceb12f 100644 --- a/EnvelopeGenerator.Common/Entities/EnvelopeHistoryEntry.vb +++ b/EnvelopeGenerator.Common/Entities/EnvelopeHistoryEntry.vb @@ -1,4 +1,6 @@ -Public Class EnvelopeHistoryEntry +Imports EnvelopeGenerator.Domain + +Public Class EnvelopeHistoryEntry Public Property EnvelopeId As Integer Public Property UserReference As String Public Property Status As Constants.EnvelopeStatus diff --git a/EnvelopeGenerator.Common/Entities/EnvelopeReceiver.vb b/EnvelopeGenerator.Common/Entities/EnvelopeReceiver.vb index 69cc8aa7..e9a5f702 100644 --- a/EnvelopeGenerator.Common/Entities/EnvelopeReceiver.vb +++ b/EnvelopeGenerator.Common/Entities/EnvelopeReceiver.vb @@ -1,8 +1,7 @@ Imports System.Drawing -Imports System.Runtime.Serialization Imports DevExpress.Utils.Svg Imports DigitalData.Modules.Base -Imports EnvelopeGenerator.Common.Constants +Imports EnvelopeGenerator.Domain.Constants Imports Newtonsoft.Json Public Class EnvelopeReceiver diff --git a/EnvelopeGenerator.Common/Entities/EnvelopeType.vb b/EnvelopeGenerator.Common/Entities/EnvelopeType.vb index 1c0f2024..9050db52 100644 --- a/EnvelopeGenerator.Common/Entities/EnvelopeType.vb +++ b/EnvelopeGenerator.Common/Entities/EnvelopeType.vb @@ -1,4 +1,5 @@ -Public Class EnvelopeType +Imports EnvelopeGenerator.Domain +Public Class EnvelopeType Public Property Id As Integer = 0 Public Property Title As String diff --git a/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj b/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj index 669a827a..1a5db4a1 100644 --- a/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj +++ b/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj @@ -274,7 +274,6 @@ - @@ -443,7 +442,12 @@ - + + + {4f32a98d-e6f0-4a09-bd97-1cf26107e837} + EnvelopeGenerator.Domain + + diff --git a/EnvelopeGenerator.Common/Helpers.vb b/EnvelopeGenerator.Common/Helpers.vb index e464f51a..100dee09 100644 --- a/EnvelopeGenerator.Common/Helpers.vb +++ b/EnvelopeGenerator.Common/Helpers.vb @@ -3,7 +3,7 @@ Imports System.IO Imports System.Security.Cryptography Imports System.Text Imports DevExpress.Utils.Svg -Imports EnvelopeGenerator.Common.Constants +Imports EnvelopeGenerator.Domain.Constants Public Class Helpers Private Shared key As String = "$xzBvyPETUS&amm8)D8x#)f;4%;?[BPd" ' Passwort-Schlüssel (16, 24, or 32 bytes) diff --git a/EnvelopeGenerator.Common/Jobs/APIBackendJobs/APIEnvelopeJob.vb b/EnvelopeGenerator.Common/Jobs/APIBackendJobs/APIEnvelopeJob.vb index fc18a37b..8e3ff0db 100644 --- a/EnvelopeGenerator.Common/Jobs/APIBackendJobs/APIEnvelopeJob.vb +++ b/EnvelopeGenerator.Common/Jobs/APIBackendJobs/APIEnvelopeJob.vb @@ -1,16 +1,9 @@ Imports DigitalData.Modules.Database Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Base -Imports GdPicture14 Imports Quartz Imports System.Security.Cryptography -Imports System.IO -Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument.FinalizeDocumentExceptions -Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument -Imports EnvelopeGenerator.Common.Constants Imports DevExpress.DataProcessing -Imports System.Data.SqlClient -Imports DevExpress.XtraRichEdit.Layout.Engine Namespace Jobs Public Class APIEnvelopeJob @@ -39,7 +32,7 @@ Namespace Jobs End Class Public Function Execute(pContext As IJobExecutionContext) As Task Implements IJob.Execute - LogConfig = pContext.MergedJobDataMap.Item(Constants.LOGCONFIG) + LogConfig = pContext.MergedJobDataMap.Item(Domain.Constants.LOGCONFIG) Logger = LogConfig.GetLogger() myTempFiles = New TempFiles(LogConfig) myTempFiles.Create() @@ -179,7 +172,7 @@ Namespace Jobs ActionService = New ActionService(pState, Database) End Sub Private Function GetDatabase(pContext As IJobExecutionContext, pLogConfig As LogConfig) As MSSQLServer - Dim oConnectionString As String = pContext.MergedJobDataMap.Item(Constants.DATABASE) + Dim oConnectionString As String = pContext.MergedJobDataMap.Item(Domain.Constants.DATABASE) Dim Database = New MSSQLServer(pLogConfig, MSSQLServer.DecryptConnectionString(oConnectionString)) Return Database diff --git a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb b/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb index 5ad56183..37a7d9ec 100644 --- a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb +++ b/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb @@ -7,7 +7,7 @@ Imports System.Security.Cryptography Imports System.IO Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument.FinalizeDocumentExceptions Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument -Imports EnvelopeGenerator.Common.Constants +Imports EnvelopeGenerator.Domain.Constants Imports DevExpress.DataProcessing Imports System.Data.SqlClient @@ -47,8 +47,8 @@ Namespace Jobs End Class Public Function Execute(pContext As IJobExecutionContext) As Task Implements IJob.Execute - Dim oGdPictureKey As String = pContext.MergedJobDataMap.Item(Constants.GDPICTURE) - LogConfig = pContext.MergedJobDataMap.Item(Constants.LOGCONFIG) + Dim oGdPictureKey As String = pContext.MergedJobDataMap.Item(Domain.Constants.GDPICTURE) + LogConfig = pContext.MergedJobDataMap.Item(Domain.Constants.LOGCONFIG) Logger = LogConfig.GetLogger() myTempFiles = New TempFiles(LogConfig) myTempFiles.Create() @@ -74,7 +74,7 @@ Namespace Jobs InitializeServices(oState) Logger.Debug("Loading PDFBurner..") - Dim pdfBurnerParams As PDFBurnerParams = pContext.MergedJobDataMap.Item(Constants.PDF_BURNER_PARAMS) + Dim pdfBurnerParams As PDFBurnerParams = pContext.MergedJobDataMap.Item(PDF_BURNER_PARAMS) PDFBurner = New PDFBurner(LogConfig, oGdPictureKey, pdfBurnerParams) Logger.Debug("Loading PDFMerger..") @@ -90,7 +90,7 @@ Namespace Jobs Logger.Debug("ExportPath: [{0}]", Config.ExportPath) - Dim oCompleteStatus As Integer = Constants.EnvelopeStatus.EnvelopeCompletelySigned + Dim oCompleteStatus As Integer = EnvelopeStatus.EnvelopeCompletelySigned Dim oSql = $"SELECT * FROM TBSIG_ENVELOPE WHERE STATUS = {oCompleteStatus} AND DATEDIFF(minute, CHANGED_WHEN, GETDATE()) >= {CompleteWaitTime} ORDER BY GUID" Dim oTable = Database.GetDatatable(oSql) @@ -436,7 +436,7 @@ Namespace Jobs End Sub Private Function GetDatabase(pContext As IJobExecutionContext, pLogConfig As LogConfig) As MSSQLServer - Dim oConnectionString As String = pContext.MergedJobDataMap.Item(Constants.DATABASE) + Dim oConnectionString As String = pContext.MergedJobDataMap.Item(Domain.Constants.DATABASE) Dim Database = New MSSQLServer(pLogConfig, MSSQLServer.DecryptConnectionString(oConnectionString)) Return Database diff --git a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/ReportItem.vb b/EnvelopeGenerator.Common/Jobs/FinalizeDocument/ReportItem.vb index 063235f6..5a24f80c 100644 --- a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/ReportItem.vb +++ b/EnvelopeGenerator.Common/Jobs/FinalizeDocument/ReportItem.vb @@ -1,4 +1,4 @@ -Imports System.Windows.Forms.VisualStyles.VisualStyleElement +Imports EnvelopeGenerator.Domain Public Class ReportItem diff --git a/EnvelopeGenerator.Common/Models/ElementModel.vb b/EnvelopeGenerator.Common/Models/ElementModel.vb index cae66440..13c5adf7 100644 --- a/EnvelopeGenerator.Common/Models/ElementModel.vb +++ b/EnvelopeGenerator.Common/Models/ElementModel.vb @@ -1,6 +1,6 @@ -Imports System.Data -Imports System.Data.SqlClient +Imports System.Data.SqlClient Imports DigitalData.Modules.Base +Imports EnvelopeGenerator.Domain Public Class ElementModel Inherits BaseModel diff --git a/EnvelopeGenerator.Common/Models/EmailTemplateModel.vb b/EnvelopeGenerator.Common/Models/EmailTemplateModel.vb index 6811e62f..7142934b 100644 --- a/EnvelopeGenerator.Common/Models/EmailTemplateModel.vb +++ b/EnvelopeGenerator.Common/Models/EmailTemplateModel.vb @@ -1,5 +1,5 @@ Imports DigitalData.Modules.Base -Imports EnvelopeGenerator.Common.Constants +Imports EnvelopeGenerator.Domain.Constants Public Class EmailTemplateModel Inherits BaseModel diff --git a/EnvelopeGenerator.Common/Models/EnvelopeModel.vb b/EnvelopeGenerator.Common/Models/EnvelopeModel.vb index 31b37247..40c82399 100644 --- a/EnvelopeGenerator.Common/Models/EnvelopeModel.vb +++ b/EnvelopeGenerator.Common/Models/EnvelopeModel.vb @@ -2,7 +2,7 @@ Imports System.Web.UI.WebControls Imports DigitalData.Modules.Base Imports DigitalData.Modules.Logging -Imports EnvelopeGenerator.Common.Constants +Imports EnvelopeGenerator.Domain.Constants Public Class EnvelopeModel Inherits BaseModel @@ -33,10 +33,10 @@ Public Class EnvelopeModel .Message = pRow.ItemEx("MESSAGE", ""), .UserId = pRow.ItemEx("USER_ID", 0), .Language = pRow.ItemEx("LANGUAGE", "de-DE"), - .Status = ObjectEx.ToEnum(Of Constants.EnvelopeStatus)(pRow.ItemEx("STATUS", Constants.EnvelopeStatus.EnvelopeCreated.ToString())), + .Status = ObjectEx.ToEnum(Of EnvelopeStatus)(pRow.ItemEx("STATUS", EnvelopeStatus.EnvelopeCreated.ToString())), .AddedWhen = pRow.Item("ADDED_WHEN"), .ChangedWhen = pRow.ItemEx(Of Date)("CHANGED_WHEN", Nothing), - .CertificationType = ObjectEx.ToEnum(Of Constants.CertificationType)(pRow.ItemEx("CERTIFICATION_TYPE", Constants.CertificationType.AdvancedElectronicSignature.ToString())), + .CertificationType = ObjectEx.ToEnum(Of CertificationType)(pRow.ItemEx("CERTIFICATION_TYPE", CertificationType.AdvancedElectronicSignature.ToString())), .User = New User(), .ExpiresWhen = pRow.ItemEx(Of Date)("EXPIRES_WHEN", Nothing), .ExpiresWarningWhen = pRow.ItemEx(Of Date)("EXPIRES_WARNING_WHEN", Nothing), @@ -46,8 +46,8 @@ Public Class EnvelopeModel .FirstReminderDays = pRow.ItemEx("FIRST_REMINDER_DAYS", 0), .ReminderIntervalDays = pRow.ItemEx("REMINDER_INTERVAL_DAYS", 0), .UseAccessCode = pRow.ItemEx("USE_ACCESS_CODE", False), - .FinalEmailToCreator = ObjectEx.ToEnum(Of Constants.FinalEmailType)(pRow.ItemEx("FINAL_EMAIL_TO_CREATOR", Constants.FinalEmailType.No.ToString())), - .FinalEmailToReceivers = ObjectEx.ToEnum(Of Constants.FinalEmailType)(pRow.ItemEx("FINAL_EMAIL_TO_RECEIVERS", Constants.FinalEmailType.No.ToString())), + .FinalEmailToCreator = ObjectEx.ToEnum(Of FinalEmailType)(pRow.ItemEx("FINAL_EMAIL_TO_CREATOR", FinalEmailType.No.ToString())), + .FinalEmailToReceivers = ObjectEx.ToEnum(Of FinalEmailType)(pRow.ItemEx("FINAL_EMAIL_TO_RECEIVERS", FinalEmailType.No.ToString())), .TFA_Enabled = pRow.ItemEx("TFA_Enabled", False) } Dim oDOC_RESULT = pRow.Item("DOC_RESULT") @@ -148,7 +148,7 @@ Public Class EnvelopeModel Dim oSql = $"INSERT INTO [dbo].[TBSIG_ENVELOPE] (MESSAGE, ENVELOPE_UUID, STATUS, USER_ID) VALUES('', '{pEnvelope.Uuid}', - '{CInt([Enum].Parse(GetType(EnvelopeStatus), Constants.EnvelopeStatus.EnvelopeCreated))}', + '{CInt([Enum].Parse(GetType(EnvelopeStatus), EnvelopeStatus.EnvelopeCreated))}', '{pEnvelope.UserId}')" Dim oCommand As New SqlCommand(oSql) 'oCommand.Parameters.Add("MESSAGE", SqlDbType.NVarChar).Value = String.Empty diff --git a/EnvelopeGenerator.Common/Models/EnvelopeTypeModel.vb b/EnvelopeGenerator.Common/Models/EnvelopeTypeModel.vb index d00784b7..fd2ecbc0 100644 --- a/EnvelopeGenerator.Common/Models/EnvelopeTypeModel.vb +++ b/EnvelopeGenerator.Common/Models/EnvelopeTypeModel.vb @@ -1,5 +1,5 @@ Imports DigitalData.Modules.Base -Imports EnvelopeGenerator.Common.Constants +Imports EnvelopeGenerator.Domain.Constants Public Class EnvelopeTypeModel Inherits BaseModel diff --git a/EnvelopeGenerator.Common/Models/HistoryModel.vb b/EnvelopeGenerator.Common/Models/HistoryModel.vb index e35b61e9..a4476be6 100644 --- a/EnvelopeGenerator.Common/Models/HistoryModel.vb +++ b/EnvelopeGenerator.Common/Models/HistoryModel.vb @@ -27,7 +27,7 @@ Public Class HistoryModel End Function Public Function HasReceiverSigned(pEnvelopeId As Integer, pReceiverId As Integer) As Boolean - Dim oEnvelopeSigned As Integer = Constants.EnvelopeStatus.DocumentSigned + Dim oEnvelopeSigned As Integer = Domain.Constants.EnvelopeStatus.DocumentSigned Dim oSql = $"SELECT COUNT(T.GUID) FROM TBSIG_ENVELOPE_HISTORY T JOIN TBSIG_RECEIVER T2 ON T.USER_REFERENCE = T2.EMAIL_ADDRESS diff --git a/EnvelopeGenerator.Common/Models/ReceiverModel.vb b/EnvelopeGenerator.Common/Models/ReceiverModel.vb index 6630b3ef..9f34f261 100644 --- a/EnvelopeGenerator.Common/Models/ReceiverModel.vb +++ b/EnvelopeGenerator.Common/Models/ReceiverModel.vb @@ -2,7 +2,7 @@ Imports System.Net.Mail Imports DevExpress.DataProcessing Imports DigitalData.Modules.Base -Imports EnvelopeGenerator.Common.Constants +Imports EnvelopeGenerator.Domain.Constants Public Class ReceiverModel Inherits BaseModel diff --git a/EnvelopeGenerator.Common/Services/ActionService.vb b/EnvelopeGenerator.Common/Services/ActionService.vb index efcb320a..206bd9f4 100644 --- a/EnvelopeGenerator.Common/Services/ActionService.vb +++ b/EnvelopeGenerator.Common/Services/ActionService.vb @@ -1,6 +1,6 @@ Imports DevExpress.DataAccess.Native.Web Imports DigitalData.Modules.Base -Imports EnvelopeGenerator.Common.Constants +Imports EnvelopeGenerator.Domain.Constants Imports EnvelopeGenerator.Common.My.Resources Imports DigitalData.Modules.Database Imports System.ComponentModel @@ -26,7 +26,7 @@ Public Class ActionService End Sub Public Function SendEnvelope(pEnvelope As Envelope) As Boolean - If HistoryService.SetEnvelopeStatus(pEnvelope, Constants.EnvelopeStatus.EnvelopeQueued, pEnvelope.User.Email) = False Then + If HistoryService.SetEnvelopeStatus(pEnvelope, EnvelopeStatus.EnvelopeQueued, pEnvelope.User.Email) = False Then Return False End If @@ -41,13 +41,13 @@ Public Class ActionService Return True End Function Public Function SetStatusDocumentRotationChanged(pEnvelope As Envelope) As Boolean - If HistoryService.SetEnvelopeStatus(pEnvelope, Constants.EnvelopeStatus.DocumentMod_Rotation, pEnvelope.User.Email) = False Then + If HistoryService.SetEnvelopeStatus(pEnvelope, EnvelopeStatus.DocumentMod_Rotation, pEnvelope.User.Email) = False Then Return False End If Return True End Function Public Function Resend_Receiver(pEnvelope As Envelope, pmail As String) As Boolean - If HistoryService.SetEnvelopeStatus(pEnvelope, Constants.EnvelopeStatus.EnvelopeQueued, pEnvelope.User.Email) = False Then + If HistoryService.SetEnvelopeStatus(pEnvelope, EnvelopeStatus.EnvelopeQueued, pEnvelope.User.Email) = False Then Return False End If Dim oSendResult As Boolean = False @@ -64,9 +64,9 @@ Public Class ActionService Public Function DeleteEnvelope(pEnvelope As Envelope, pReason As String) As Boolean Dim oStatus As EnvelopeStatus If pEnvelope.IsAlreadySent Then - oStatus = Constants.EnvelopeStatus.EnvelopeWithdrawn + oStatus = EnvelopeStatus.EnvelopeWithdrawn Else - oStatus = Constants.EnvelopeStatus.EnvelopeDeleted + oStatus = EnvelopeStatus.EnvelopeDeleted End If Dim oUpd = $"UPDATE TBSIG_ENVELOPE SET REJECTION_REASON = '{pReason}' WHERE GUID = {pEnvelope.Id}" myDatabase.ExecuteNonQuery(oUpd) @@ -97,7 +97,7 @@ Public Class ActionService Public Function OpenEnvelope(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean Dim oUserReference = pReceiver.Email - If HistoryService.SetEnvelopeStatus(pEnvelope, Constants.EnvelopeStatus.DocumentOpened, oUserReference) = False Then + If HistoryService.SetEnvelopeStatus(pEnvelope, EnvelopeStatus.DocumentOpened, oUserReference) = False Then Return False End If @@ -107,7 +107,7 @@ Public Class ActionService Public Function RequestAccessCode(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean Dim oUserReference = pReceiver.Email - If HistoryService.SetEnvelopeStatus(pEnvelope, Constants.EnvelopeStatus.AccessCodeRequested, oUserReference) = False Then + If HistoryService.SetEnvelopeStatus(pEnvelope, EnvelopeStatus.AccessCodeRequested, oUserReference) = False Then Return False End If @@ -117,7 +117,7 @@ Public Class ActionService Public Function EnterCorrectAccessCode(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean Dim oUserReference = pReceiver.Email - If HistoryService.SetEnvelopeStatus(pEnvelope, Constants.EnvelopeStatus.AccessCodeCorrect, oUserReference) = False Then + If HistoryService.SetEnvelopeStatus(pEnvelope, EnvelopeStatus.AccessCodeCorrect, oUserReference) = False Then Return False End If @@ -127,7 +127,7 @@ Public Class ActionService Public Function EnterIncorrectAccessCode(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean Dim oUserReference = pReceiver.Email - If HistoryService.SetEnvelopeStatus(pEnvelope, Constants.EnvelopeStatus.AccessCodeIncorrect, oUserReference) = False Then + If HistoryService.SetEnvelopeStatus(pEnvelope, EnvelopeStatus.AccessCodeIncorrect, oUserReference) = False Then Return False End If @@ -137,7 +137,7 @@ Public Class ActionService Public Function SignEnvelope(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean Dim oUserReference = pReceiver.Email - If HistoryService.SetEnvelopeStatus(pEnvelope, Constants.EnvelopeStatus.DocumentSigned, oUserReference) = False Then + If HistoryService.SetEnvelopeStatus(pEnvelope, EnvelopeStatus.DocumentSigned, oUserReference) = False Then Return False End If @@ -145,7 +145,7 @@ Public Class ActionService End Function Public Function FinalizeEnvelope(pEnvelope As Envelope) As Boolean - If HistoryService.SetEnvelopeStatus(pEnvelope, Constants.EnvelopeStatus.EnvelopeArchived, "System") = False Then + If HistoryService.SetEnvelopeStatus(pEnvelope, EnvelopeStatus.EnvelopeArchived, "System") = False Then Return False End If @@ -153,7 +153,7 @@ Public Class ActionService End Function Public Function CompleteEnvelope(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean ', pAttachment As String - If HistoryService.SetEnvelopeStatus(pEnvelope, Constants.EnvelopeStatus.MessageCompletionSent, pReceiver.Email) = False Then + If HistoryService.SetEnvelopeStatus(pEnvelope, EnvelopeStatus.MessageCompletionSent, pReceiver.Email) = False Then Return False End If @@ -161,7 +161,7 @@ Public Class ActionService End Function Public Function CompleteEnvelope(pEnvelope As Envelope) As Boolean ', pAttachment As String - If HistoryService.SetEnvelopeStatus(pEnvelope, Constants.EnvelopeStatus.MessageCompletionSent, pEnvelope.User.Email) = False Then + If HistoryService.SetEnvelopeStatus(pEnvelope, EnvelopeStatus.MessageCompletionSent, pEnvelope.User.Email) = False Then Return False End If @@ -169,7 +169,7 @@ Public Class ActionService End Function Public Function CreateReport(pEnvelope As Envelope) As Boolean - If HistoryService.SetEnvelopeStatus(pEnvelope, Constants.EnvelopeStatus.EnvelopeReportCreated, "System") = False Then + If HistoryService.SetEnvelopeStatus(pEnvelope, EnvelopeStatus.EnvelopeReportCreated, "System") = False Then Return False End If diff --git a/EnvelopeGenerator.Common/Services/EmailService.vb b/EnvelopeGenerator.Common/Services/EmailService.vb index 584c720c..f2391aee 100644 --- a/EnvelopeGenerator.Common/Services/EmailService.vb +++ b/EnvelopeGenerator.Common/Services/EmailService.vb @@ -1,7 +1,4 @@ - -Imports DigitalData.Modules.Base -Imports DigitalData.Modules.Logging -Imports EnvelopeGenerator.Common.My.Resources +Imports DigitalData.Modules.Logging Public Class EmailService Inherits BaseService @@ -18,7 +15,7 @@ Public Class EmailService Public Function SendEnvelopeDeletedEmail(pEnvelope As Envelope, pReceiver As EnvelopeReceiver, pReason As String) As Boolean Logger.Debug("SendEnvelopeDeletedEmail - Creating email data object...") - Dim oEmailData As New EmailData(pEnvelope, pReceiver, Constants.EnvelopeStatus.MessageDeletionSent) With + Dim oEmailData As New EmailData(pEnvelope, pReceiver, Domain.Constants.EnvelopeStatus.MessageDeletionSent) With { .SignatureLink = "", .ADDED_WHO_PROCESS = pEnvelope.CURRENT_WORK_APP @@ -36,7 +33,7 @@ Public Class EmailService Public Function SendDocumentReceivedEmail(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean Logger.Debug("Creating email data object.") - Dim oEmailData As New EmailData(pEnvelope, pReceiver, Constants.EnvelopeStatus.MessageInvitationSent) With + Dim oEmailData As New EmailData(pEnvelope, pReceiver, Domain.Constants.EnvelopeStatus.MessageInvitationSent) With { .SignatureLink = Helpers.GetEnvelopeURL(State.DbConfig.SignatureHost, pEnvelope.Uuid, pReceiver.Signature), .ADDED_WHO_PROCESS = pEnvelope.CURRENT_WORK_APP @@ -56,7 +53,7 @@ Public Class EmailService Logger.Debug($"State.DbConfig.SignatureHost: {State.DbConfig.SignatureHost}") Logger.Debug($" pEnvelope.Uuid: {pEnvelope.Uuid}") Logger.Debug($" pReceiver.Signature: {pReceiver.Signature}") - Dim oEmailData As New EmailData(pEnvelope, pReceiver, Constants.EnvelopeStatus.MessageInvitationSent) With + Dim oEmailData As New EmailData(pEnvelope, pReceiver, Domain.Constants.EnvelopeStatus.MessageInvitationSent) With { .SignatureLink = Helpers.GetEnvelopeURL(State.DbConfig.SignatureHost, pEnvelope.Uuid, pReceiver.Signature), .ADDED_WHO_PROCESS = pEnvelope.CURRENT_WORK_APP @@ -70,7 +67,7 @@ Public Class EmailService Logger.Debug($"State.DbConfig.SignatureHost: {State.DbConfig.SignatureHost}") Logger.Debug($" pEnvelope.Uuid: {pEnvelope.Uuid}") Logger.Debug($" pReceiver.Signature: {pReceiver.Signature}") - Dim oEmailData As New EmailData(pEnvelope, pReceiver, Constants.EnvelopeStatus.MessageAccessCodeSent) With + Dim oEmailData As New EmailData(pEnvelope, pReceiver, Domain.Constants.EnvelopeStatus.MessageAccessCodeSent) With { .SignatureLink = Helpers.GetEnvelopeURL(State.DbConfig.SignatureHost, pEnvelope.Uuid, pReceiver.Signature), .ADDED_WHO_PROCESS = pEnvelope.CURRENT_WORK_APP @@ -88,7 +85,7 @@ Public Class EmailService Public Function SendSignedEmail(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean Logger.Debug("Creating email data object.") - Dim oEmailData = New EmailData(pEnvelope, pReceiver, Constants.EnvelopeStatus.MessageConfirmationSent) With + Dim oEmailData = New EmailData(pEnvelope, pReceiver, Domain.Constants.EnvelopeStatus.MessageConfirmationSent) With { .SignatureLink = "" } @@ -105,7 +102,7 @@ Public Class EmailService Public Function SendDocumentCompletedEmailToReceiver(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean ', pAttachment As String Logger.Debug("Creating email data object.") - Dim oEmailData = New EmailData(pEnvelope, pReceiver, Constants.EnvelopeStatus.MessageCompletionSent) With + Dim oEmailData = New EmailData(pEnvelope, pReceiver, Domain.Constants.EnvelopeStatus.MessageCompletionSent) With { .SignatureLink = "", .ATT1_RELATED_ID = pEnvelope.Id, @@ -126,7 +123,7 @@ Public Class EmailService Public Function SendDocumentCompletedEmailToCreator(pEnvelope As Envelope) As Boolean ', pAttachment As String Logger.Debug("Creating email data object.") - Dim oEmailData = New EmailData(pEnvelope, Constants.EnvelopeStatus.MessageCompletionSent) With + Dim oEmailData = New EmailData(pEnvelope, Domain.Constants.EnvelopeStatus.MessageCompletionSent) With { .SignatureLink = "", .ATT1_RELATED_ID = pEnvelope.Id, diff --git a/EnvelopeGenerator.Common/Services/HistoryService.vb b/EnvelopeGenerator.Common/Services/HistoryService.vb index 5733b65d..6795c6f3 100644 --- a/EnvelopeGenerator.Common/Services/HistoryService.vb +++ b/EnvelopeGenerator.Common/Services/HistoryService.vb @@ -1,7 +1,5 @@ - -Imports DigitalData.Modules.Base -Imports DigitalData.Modules.Logging -Imports EnvelopeGenerator.Common.Constants +Imports DigitalData.Modules.Logging +Imports EnvelopeGenerator.Domain.Constants Public Class HistoryService Inherits BaseService @@ -34,4 +32,4 @@ Public Class HistoryService Logger.Debug("Envelope status set to [{0}] for Envelope [{1}].", pStatus.ToString, pEnvelope.Id) Return True End Function -End Class +End Class \ No newline at end of file diff --git a/EnvelopeGenerator.Common/Services/TemplateService.vb b/EnvelopeGenerator.Common/Services/TemplateService.vb index 4adab2a8..e1e5cbd6 100644 --- a/EnvelopeGenerator.Common/Services/TemplateService.vb +++ b/EnvelopeGenerator.Common/Services/TemplateService.vb @@ -1,5 +1,6 @@ Imports DigitalData.Modules.Base Imports DigitalData.Modules.Logging +Imports EnvelopeGenerator.Domain.Constants Public Class TemplateService Inherits BaseService @@ -35,7 +36,7 @@ Public Class TemplateService Public Sub FillDocumentReceivedEmailBody(pEmailData As EmailData) InitDictionary(pEmailData) - Dim oTemplate = EmailHtmlTemplateModel.GetById(Constants.EmailTemplateType.DocumentReceived) + Dim oTemplate = EmailHtmlTemplateModel.GetById(EmailTemplateType.DocumentReceived) pEmailData.EmailBody = FillTemplate(oTemplate.Body) pEmailData.EmailSubject = FillTemplate(oTemplate.Subject) @@ -43,7 +44,7 @@ Public Class TemplateService Public Sub FillEnvelopeDeletedEmailBody(pEmailData As EmailData, pReason As String) InitDictionary(pEmailData, pReason) - Dim oTemplate = EmailHtmlTemplateModel.GetById(Constants.EmailTemplateType.DocumentDeleted) + Dim oTemplate = EmailHtmlTemplateModel.GetById(EmailTemplateType.DocumentDeleted) pEmailData.EmailBody = FillTemplate(oTemplate.Body, pReason) pEmailData.EmailSubject = FillTemplate(oTemplate.Subject) @@ -51,7 +52,7 @@ Public Class TemplateService Public Sub FillDocumentSignedEmailBody(pEmailData As EmailData) InitDictionary(pEmailData) - Dim oTemplate = EmailHtmlTemplateModel.GetById(Constants.EmailTemplateType.DocumentSigned) + Dim oTemplate = EmailHtmlTemplateModel.GetById(EmailTemplateType.DocumentSigned) pEmailData.EmailBody = FillTemplate(oTemplate.Body) pEmailData.EmailSubject = FillTemplate(oTemplate.Subject) @@ -59,7 +60,7 @@ Public Class TemplateService Public Sub FillDocumentCompletedEmailBody(pEmailData As EmailData) InitDictionary(pEmailData) - Dim oTemplate = EmailHtmlTemplateModel.GetById(Constants.EmailTemplateType.DocumentCompleted) + Dim oTemplate = EmailHtmlTemplateModel.GetById(EmailTemplateType.DocumentCompleted) pEmailData.EmailBody = FillTemplate(oTemplate.Body) pEmailData.EmailSubject = FillTemplate(oTemplate.Subject) @@ -67,7 +68,7 @@ Public Class TemplateService Public Sub FillDocumentAccessCodeReceivedEmailBody(pEmailData As EmailData) InitDictionary(pEmailData) - Dim oTemplate = EmailHtmlTemplateModel.GetById(Constants.EmailTemplateType.DocumentAccessCodeReceived) + Dim oTemplate = EmailHtmlTemplateModel.GetById(EmailTemplateType.DocumentAccessCodeReceived) pEmailData.EmailBody = FillTemplate(oTemplate.Body) pEmailData.EmailSubject = FillTemplate(oTemplate.Subject) diff --git a/EnvelopeGenerator.Domain/Constants.cs b/EnvelopeGenerator.Domain/Constants.cs new file mode 100644 index 00000000..4c6d5e0b --- /dev/null +++ b/EnvelopeGenerator.Domain/Constants.cs @@ -0,0 +1,183 @@ +#if NETFRAMEWORK +using System.Collections.Generic; +#endif + +namespace EnvelopeGenerator.Domain +{ + public static class Constants + { + #region Status Fields + + // http://wiki.dd/xwiki13/bin/view/Anwendungen/Produkt-Handbuch/Sonstiges/SignFlow/Envelope%20Status/ + public enum EnvelopeStatus + { + Invalid = 0, + EnvelopeCreated = 1001, + EnvelopeSaved = 1002, + EnvelopeQueued = 1003, + EnvelopeSent = 1004, // Nicht verwendet + EnvelopePartlySigned = 1005, + EnvelopeCompletelySigned = 1006, + EnvelopeReportCreated = 1007, + EnvelopeArchived = 1008, + EnvelopeDeleted = 1009, + EnvelopeRejected = 10007, + EnvelopeWithdrawn = 10009, + AccessCodeRequested = 2001, + AccessCodeCorrect = 2002, + AccessCodeIncorrect = 2003, + DocumentOpened = 2004, + DocumentSigned = 2005, + DocumentForwarded = 2006, + DocumentRejected = 2007, + EnvelopeShared = 2008, + EnvelopeViewed = 2009, + MessageInvitationSent = 3001, // Wird von Trigger verwendet + MessageAccessCodeSent = 3002, + MessageConfirmationSent = 3003, + MessageDeletionSent = 3004, + MessageCompletionSent = 3005, + DocumentMod_Rotation = 4001 + } + + public static class Status + { + public static readonly IReadOnlyList NonHist = new List + { + EnvelopeStatus.Invalid, + EnvelopeStatus.EnvelopeSaved, + EnvelopeStatus.EnvelopeSent, + EnvelopeStatus.EnvelopePartlySigned + }; + + public static readonly IReadOnlyList RelatedToFormApp = new List + { + EnvelopeStatus.EnvelopeCreated, + EnvelopeStatus.DocumentMod_Rotation + }; + } + + // TODO: standardize in xwiki + public enum ReferenceType + { + Sender = 1, + Receiver, + System, + Unknown + } + + public enum ElementStatus + { + Created = 0 + } + + public enum DocumentStatus + { + Created = 0, + Signed = 1 + } + + public enum ReceiverStatus + { + Unsigned = 0, + Signed = 1 + } + + #endregion + + #region Type Fields + + public enum ElementType + { + Signature = 1 + } + + public enum ContractType + { + Contract = 1, + ReadAndSign = 2 + } + + public enum ColorType + { + ReceiverColor1 = 1, + ReceiverColor2 = 2, + ReceiverColor3 = 3, + ReceiverColor4 = 4, + ReceiverColor5 = 5, + ReceiverColor6 = 6, + ReceiverColor7 = 7, + ReceiverColor8 = 8, + ReceiverColor9 = 9, + ReceiverColor10 = 10 + } + + public enum CertificationType + { + AdvancedElectronicSignature = 1 + // ElectronicSignature = 1 + // QualifiedSignature = 2 + } + + public enum FinalEmailType + { + No = 0, + Yes = 1, + YesWithAttachment = 2 + } + + public enum PageOrientation + { + Portrait = 0, + Landscape = 1 + } + + public enum EmailTemplateType + { + DocumentReceived = 0, + DocumentSigned, + DocumentDeleted, + DocumentCompleted, + DocumentAccessCodeReceived, + DocumentShared, + TotpSecret, + DocumentRejected_ADM, + DocumentRejected_REC, + DocumentRejected_REC_2 + } + + public enum EncodeType + { + EnvelopeReceiver, + EnvelopeReceiverReadOnly, + Undefined, + DocumentForwarded, + DocumentShared + } + + #endregion + + #region Role + + public static class ReceiverRole + { + public const string PreAuth = "PreAuth"; + public const string FullyAuth = "FullyAuth"; + } + + #endregion + + #region Constants + + public const string DATABASE = "DATABASE"; + public const string LOGCONFIG = "LOGCONFIG"; + public const string GDPICTURE = "GDPICTURE"; + public const string PDF_BURNER_PARAMS = "PDFBurnerParams"; + + public const string GREEN_300 = "#bbf7d0"; + public const string RED_300 = "#fecaca"; + public const string ORANGE_300 = "#fed7aa"; + + #endregion + } +} diff --git a/EnvelopeGenerator.Domain/Entities/Envelope.cs b/EnvelopeGenerator.Domain/Entities/Envelope.cs index c9cfb49b..be62bb2c 100644 --- a/EnvelopeGenerator.Domain/Entities/Envelope.cs +++ b/EnvelopeGenerator.Domain/Entities/Envelope.cs @@ -1,5 +1,4 @@ -using EnvelopeGenerator.Common; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; #if NETFRAMEWORK using System; diff --git a/EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj b/EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj index bb6db93b..718e9ed4 100644 --- a/EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj +++ b/EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj @@ -22,8 +22,4 @@ - - - - diff --git a/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb b/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb index cd9510a2..6eced691 100644 --- a/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb +++ b/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb @@ -3,9 +3,8 @@ Imports System.IO Imports DevExpress.XtraBars.Docking Imports DigitalData.Modules.Logging Imports EnvelopeGenerator.Common -Imports EnvelopeGenerator.Common.Constants Imports EnvelopeGenerator.Common.My -Imports GdPicture14 +Imports EnvelopeGenerator.Domain.Constants Public Class EnvelopeEditorController Inherits BaseController diff --git a/EnvelopeGenerator.Form/Controllers/FieldEditorController.vb b/EnvelopeGenerator.Form/Controllers/FieldEditorController.vb index 3e76284f..38999c07 100644 --- a/EnvelopeGenerator.Form/Controllers/FieldEditorController.vb +++ b/EnvelopeGenerator.Form/Controllers/FieldEditorController.vb @@ -1,6 +1,7 @@ Imports DevExpress.XtraPrinting.Native Imports EnvelopeGenerator.Common Imports GdPicture14.Annotations +Imports EnvelopeGenerator.Domain Public Class FieldEditorController Inherits BaseController diff --git a/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj b/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj index a4a95e32..9bd4516c 100644 --- a/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj +++ b/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj @@ -506,6 +506,10 @@ {6ea0c51f-c2b1-4462-8198-3de0b32b74f8} EnvelopeGenerator.Common + + {4f32a98d-e6f0-4a09-bd97-1cf26107e837} + EnvelopeGenerator.Domain + diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb index 0d44382d..c4abce28 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb @@ -1,24 +1,18 @@ Imports System.ComponentModel -Imports System.Data.SqlClient Imports System.IO Imports System.Text.RegularExpressions -Imports DevExpress.Export.Xl -Imports DevExpress.Utils.CommonDialogs Imports DevExpress.Utils.Drawing -Imports DevExpress.Utils.Svg.CommonSvgImages Imports DevExpress.XtraEditors -Imports DevExpress.XtraExport.Helpers Imports DevExpress.XtraGrid -Imports DevExpress.XtraGrid.Columns -Imports DevExpress.XtraGrid.Views.Base Imports DevExpress.XtraGrid.Views.Grid Imports DevExpress.XtraSplashScreen Imports DigitalData.Modules.Base Imports DigitalData.Modules.Logging Imports EnvelopeGenerator.Common -Imports EnvelopeGenerator.Common.Constants +Imports EnvelopeGenerator.Domain Imports EnvelopeGenerator.Common.My Imports GdPicture14 +Imports EnvelopeGenerator.Domain.Constants Partial Public Class frmEnvelopeEditor Public Property Envelope As Envelope @@ -467,7 +461,7 @@ Partial Public Class frmEnvelopeEditor Dim oReceiver As EnvelopeReceiver = ViewReceivers.GetRow(e.RowHandle) Dim oUsedColors = Receivers.Select(Of Integer)(Function(r) r.ColorType).ToList() - Dim oAllColors = [Enum].GetValues(GetType(ColorType)).Cast(Of Integer).ToList() + Dim oAllColors = [Enum].GetValues(GetType(Domain.Constants.ColorType)).Cast(Of Integer).ToList() Dim oUnusedColors = oAllColors.Except(oUsedColors) If oUnusedColors.Any() Then oReceiver.ColorType = oUnusedColors.Min() @@ -576,7 +570,7 @@ Partial Public Class frmEnvelopeEditor CheckAccesscode(e.RowHandle, oAccessCode) End If Else - Dim oMsg = Resources.Envelope.Error_email_Validation + Dim oMsg = Resources.Envelope.Error_email_Validation oMsg = oMsg.Replace("@Mail", oEmailAdress) MsgBox(oMsg, MsgBoxStyle.Exclamation, Text) ViewReceivers.DeleteRow(ViewReceivers.FocusedRowHandle) @@ -756,7 +750,7 @@ Partial Public Class frmEnvelopeEditor End Sub Private Sub btnShowFile_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnShowFile.ItemClick - showDocument + showdocument() End Sub Sub showdocument() If Not IsNothing(Documents) Then diff --git a/EnvelopeGenerator.Form/frmEnvelopeMainData.vb b/EnvelopeGenerator.Form/frmEnvelopeMainData.vb index a6978b64..af9c75ab 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeMainData.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeMainData.vb @@ -2,6 +2,7 @@ Imports EnvelopeGenerator.Common.My Imports EnvelopeGenerator.Common.Constants Imports System.ComponentModel +Imports EnvelopeGenerator.Domain.Constants Public Class frmEnvelopeMainData Private FormLoaded As Boolean = False diff --git a/EnvelopeGenerator.Form/frmFieldEditor.vb b/EnvelopeGenerator.Form/frmFieldEditor.vb index 84533ce2..745c0ecd 100644 --- a/EnvelopeGenerator.Form/frmFieldEditor.vb +++ b/EnvelopeGenerator.Form/frmFieldEditor.vb @@ -6,6 +6,7 @@ Imports DigitalData.Modules.Logging Imports EnvelopeGenerator.Common Imports EnvelopeGenerator.Common.Constants Imports EnvelopeGenerator.Common.My +Imports EnvelopeGenerator.Domain.Constants Imports GdPicture14 Imports GdPicture14.Annotations diff --git a/EnvelopeGenerator.Form/frmMain.vb b/EnvelopeGenerator.Form/frmMain.vb index cb6e755b..c2177bb5 100644 --- a/EnvelopeGenerator.Form/frmMain.vb +++ b/EnvelopeGenerator.Form/frmMain.vb @@ -10,12 +10,9 @@ Imports DigitalData.Modules.Base Imports DigitalData.Modules.Logging Imports EnvelopeGenerator.Common Imports EnvelopeGenerator.Common.My -Imports System.Diagnostics Imports System.ComponentModel Imports DevExpress.XtraPrinting -Imports System.Web -Imports EnvelopeGenerator.Common.Constants -Imports System.Security.Cryptography +Imports DigitalData.Domain Public Class frmMain Private ReadOnly LogConfig As LogConfig @@ -306,12 +303,12 @@ Public Class frmMain End If Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(e.RowHandle) - If oEnvelope.Status = Common.Constants.EnvelopeStatus.EnvelopePartlySigned Then - e.Appearance.BackColor = ColorTranslator.FromHtml(Common.Constants.GREEN_300) + If oEnvelope.Status = Domain.Constants.EnvelopeStatus.EnvelopePartlySigned Then + e.Appearance.BackColor = ColorTranslator.FromHtml(Domain.Constants.GREEN_300) End If - If oEnvelope.Status = Common.Constants.EnvelopeStatus.EnvelopeQueued Or oEnvelope.Status = Common.Constants.EnvelopeStatus.EnvelopeSent Then - e.Appearance.BackColor = ColorTranslator.FromHtml(Common.Constants.ORANGE_300) + If oEnvelope.Status = Domain.Constants.EnvelopeStatus.EnvelopeQueued Or oEnvelope.Status = Domain.Constants.EnvelopeStatus.EnvelopeSent Then + e.Appearance.BackColor = ColorTranslator.FromHtml(Domain.Constants.ORANGE_300) End If End Sub @@ -327,10 +324,10 @@ Public Class frmMain Exit Sub End If - If oReceiver.Status = Common.Constants.ReceiverStatus.Signed Then - e.Appearance.BackColor = ColorTranslator.FromHtml(Common.Constants.GREEN_300) + If oReceiver.Status = Domain.Constants.ReceiverStatus.Signed Then + e.Appearance.BackColor = ColorTranslator.FromHtml(Domain.Constants.GREEN_300) Else - e.Appearance.BackColor = ColorTranslator.FromHtml(Common.Constants.RED_300) + e.Appearance.BackColor = ColorTranslator.FromHtml(Domain.Constants.RED_300) End If End Sub @@ -340,12 +337,12 @@ Public Class frmMain End If Dim oEnvelope As Envelope = ViewCompleted.GetRow(e.RowHandle) - If oEnvelope.Status = Common.Constants.EnvelopeStatus.EnvelopeCompletelySigned Then - e.Appearance.BackColor = ColorTranslator.FromHtml(Common.Constants.GREEN_300) + If oEnvelope.Status = Domain.Constants.EnvelopeStatus.EnvelopeCompletelySigned Then + e.Appearance.BackColor = ColorTranslator.FromHtml(Domain.Constants.GREEN_300) End If - If oEnvelope.Status = Common.Constants.EnvelopeStatus.EnvelopeDeleted Or oEnvelope.Status = Common.Constants.EnvelopeStatus.EnvelopeWithdrawn Or oEnvelope.Status = Common.Constants.EnvelopeStatus.EnvelopeRejected Then - e.Appearance.BackColor = ColorTranslator.FromHtml(Common.Constants.RED_300) + If oEnvelope.Status = Domain.Constants.EnvelopeStatus.EnvelopeDeleted Or oEnvelope.Status = Domain.Constants.EnvelopeStatus.EnvelopeWithdrawn Or oEnvelope.Status = Domain.Constants.EnvelopeStatus.EnvelopeRejected Then + e.Appearance.BackColor = ColorTranslator.FromHtml(Domain.Constants.RED_300) End If End Sub @@ -361,10 +358,10 @@ Public Class frmMain Exit Sub End If - If oReceiver.Status = Common.Constants.ReceiverStatus.Signed Then - e.Appearance.BackColor = ColorTranslator.FromHtml(Common.Constants.GREEN_300) + If oReceiver.Status = Domain.Constants.ReceiverStatus.Signed Then + e.Appearance.BackColor = ColorTranslator.FromHtml(Domain.Constants.GREEN_300) Else - e.Appearance.BackColor = ColorTranslator.FromHtml(Common.Constants.RED_300) + e.Appearance.BackColor = ColorTranslator.FromHtml(Domain.Constants.RED_300) End If End Sub @@ -507,7 +504,7 @@ Public Class frmMain End If Dim oEnvelope As Envelope = ViewCompleted.GetRow(ViewCompleted.FocusedRowHandle) - If oEnvelope.Status = Common.Constants.EnvelopeStatus.EnvelopeArchived Then + If oEnvelope.Status = Domain.Constants.EnvelopeStatus.EnvelopeArchived Then bbtnitmEB.Enabled = True Else bbtnitmEB.Enabled = False @@ -811,16 +808,16 @@ Public Class frmMain Dim oMailToCreator = oEnvelope.FinalEmailToCreator Dim oMailToReceivers = oEnvelope.FinalEmailToReceivers - If oMailToCreator <> FinalEmailType.No Then + If oMailToCreator <> Domain.Constants.FinalEmailType.No Then MsgBox("Finale email an Creator könnten/würden gesendet werden!") Else - MsgBox("Finale email an Creator könnte/würde nicht erzeugt werden!" & vbNewLine & $"No SendFinalEmailToCreator - oMailToCreator [{oMailToCreator}] <> [{FinalEmailType.No}]") + MsgBox("Finale email an Creator könnte/würde nicht erzeugt werden!" & vbNewLine & $"No SendFinalEmailToCreator - oMailToCreator [{oMailToCreator}] <> [{Domain.Constants.FinalEmailType.No}]") End If - If oMailToReceivers <> FinalEmailType.No Then + If oMailToReceivers <> Domain.Constants.FinalEmailType.No Then MsgBox("Finale email an Unterzeichner könnten/würden gesendet werden!") Else - MsgBox("Finale email an Unterzeichner könnte/würde nicht erzeugt werden!" & vbNewLine & $"No SendFinalEmailToReceivers - oMailToReceivers [{oMailToReceivers}] <> [{FinalEmailType.No}]") + MsgBox("Finale email an Unterzeichner könnte/würde nicht erzeugt werden!" & vbNewLine & $"No SendFinalEmailToReceivers - oMailToReceivers [{oMailToReceivers}] <> [{Domain.Constants.FinalEmailType.No}]") End If End Sub Private Function GetState() As State