diff --git a/EnvelopeGenerator.Common/Jobs/APIBackendJobs/SendInvitationMailJob.vb b/EnvelopeGenerator.Common/Jobs/APIBackendJobs/SendInvitationMailJob.vb index 8ce881a9..8455e39a 100644 --- a/EnvelopeGenerator.Common/Jobs/APIBackendJobs/SendInvitationMailJob.vb +++ b/EnvelopeGenerator.Common/Jobs/APIBackendJobs/SendInvitationMailJob.vb @@ -125,7 +125,7 @@ Namespace Jobs ReceiverModel = New ReceiverModel(pState) End Sub Private Sub InitializeServices(pState As State) - ActionService = New ActionService(pState) + 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) diff --git a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb b/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb index a0e02d60..1cec375a 100644 --- a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb +++ b/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb @@ -424,7 +424,7 @@ Namespace Jobs End Function Private Sub InitializeServices(pState As State) - ActionService = New ActionService(pState) + ActionService = New ActionService(pState, Database) End Sub Private Sub InitializeModels(pState As State) diff --git a/EnvelopeGenerator.Common/My Project/AssemblyInfo.vb b/EnvelopeGenerator.Common/My Project/AssemblyInfo.vb index 52938667..36f52719 100644 --- a/EnvelopeGenerator.Common/My Project/AssemblyInfo.vb +++ b/EnvelopeGenerator.Common/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' indem Sie "*" wie unten gezeigt eingeben: ' - - + + diff --git a/EnvelopeGenerator.Common/Services/ActionService.vb b/EnvelopeGenerator.Common/Services/ActionService.vb index 2080a9e8..da1cd171 100644 --- a/EnvelopeGenerator.Common/Services/ActionService.vb +++ b/EnvelopeGenerator.Common/Services/ActionService.vb @@ -2,19 +2,23 @@ Imports DigitalData.Modules.Base Imports EnvelopeGenerator.Common.Constants Imports EnvelopeGenerator.Common.My.Resources +Imports DigitalData.Modules.Database Public Class ActionService Inherits BaseService + Private ReadOnly EmailService As EmailService Private ReadOnly HistoryService As HistoryService Private ReadOnly ReceiverModel As ReceiverModel + Private myDatabase As MSSQLServer - Public Sub New(pState As State) + + Public Sub New(pState As State, pDD_ECM As MSSQLServer) MyBase.New(pState) - + myDatabase = pDD_ECM EmailService = New EmailService(pState) HistoryService = New HistoryService(pState) ReceiverModel = New ReceiverModel(pState) @@ -63,6 +67,8 @@ Public Class ActionService Else oStatus = Constants.EnvelopeStatus.EnvelopeDeleted End If + Dim oUpd = $"UPDATE TBSIG_ENVELOPE SET REJECTION_REASON = '{pReason}' WHERE GUID = {pEnvelope.Id}" + myDatabase.ExecuteNonQuery(oUpd) If HistoryService.SetEnvelopeStatus(pEnvelope, oStatus, pEnvelope.User.Email) = False Then Return False End If diff --git a/EnvelopeGenerator.Common/Services/BaseService.vb b/EnvelopeGenerator.Common/Services/BaseService.vb index 4e0486e0..5149c8bb 100644 --- a/EnvelopeGenerator.Common/Services/BaseService.vb +++ b/EnvelopeGenerator.Common/Services/BaseService.vb @@ -1,13 +1,10 @@ Imports DigitalData.Modules.Base - Public Class BaseService Inherits BaseClass Friend Property State As State - Public Sub New(pState As State) MyBase.New(pState.LogConfig) - State = pState End Sub End Class diff --git a/EnvelopeGenerator.Form/Controllers/BaseController.vb b/EnvelopeGenerator.Form/Controllers/BaseController.vb index e95260a9..ce4c1687 100644 --- a/EnvelopeGenerator.Form/Controllers/BaseController.vb +++ b/EnvelopeGenerator.Form/Controllers/BaseController.vb @@ -28,7 +28,7 @@ Public MustInherit Class BaseController State = pState Database = pState.Database InitializeModels(pState) - ActionService = New ActionService(pState) + ActionService = New ActionService(pState, Nothing) End Sub Private Sub InitializeModels(pState As State) diff --git a/EnvelopeGenerator.Form/frm2Factor_Properties.vb b/EnvelopeGenerator.Form/frm2Factor_Properties.vb index 3ece4500..87ed0463 100644 --- a/EnvelopeGenerator.Form/frm2Factor_Properties.vb +++ b/EnvelopeGenerator.Form/frm2Factor_Properties.vb @@ -38,6 +38,6 @@ Public Class frm2Factor_Properties End If End If txtMail.Text = mail - txtValid.Text = Deadline.ToLongDateString + txtValid.Text = Deadline.ToString End Sub End Class \ No newline at end of file diff --git a/EnvelopeGenerator.Form/frmMain.vb b/EnvelopeGenerator.Form/frmMain.vb index fcf3a851..cb6e755b 100644 --- a/EnvelopeGenerator.Form/frmMain.vb +++ b/EnvelopeGenerator.Form/frmMain.vb @@ -57,8 +57,10 @@ Public Class frmMain End Try If MYUSER.IsAdmin Then XtraTabControlMain.TabPages(2).PageVisible = True + XtraTabControlMain.TabPages(3).PageVisible = True Else XtraTabControlMain.TabPages(2).PageVisible = False + XtraTabControlMain.TabPages(3).PageVisible = False End If LoadEnvelopeData() End Sub @@ -224,6 +226,7 @@ Public Class frmMain bbtnitm_ResendInvitation.Enabled = False bbtnitmInfoMail.Enabled = False bbtnitmEB.Enabled = True + bbtnitm2Faktor.Enabled = False LoadEnvelopeData() Case 0 btnEditEnvelope.Enabled = True @@ -232,6 +235,7 @@ Public Class frmMain btnShowDocument.Enabled = True bbtnitm_ResendInvitation.Enabled = True bbtnitmInfoMail.Enabled = True + bbtnitm2Faktor.Enabled = True bbtnitmEB.Enabled = False LoadEnvelopeData()