Common Rejection update, SendInvitationMailJob

This commit is contained in:
Developer01 2025-05-08 17:01:12 +02:00
parent 5a8f2d298f
commit 773b43b1ad
8 changed files with 18 additions and 11 deletions

View File

@ -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)

View File

@ -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)

View File

@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' indem Sie "*" wie unten gezeigt eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.6.0.0")>
<Assembly: AssemblyFileVersion("2.6.0.0")>
<Assembly: AssemblyVersion("2.7.0.0")>
<Assembly: AssemblyFileVersion("2.7.0.0")>

View File

@ -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

View File

@ -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

View File

@ -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)

View File

@ -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

View File

@ -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()