diff --git a/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb b/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb index 37125c5f..300e9d7f 100644 --- a/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb +++ b/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb @@ -143,7 +143,9 @@ Namespace Jobs Logger.Debug("Documents merged!") Dim oOutputDirectoryPath = Path.Combine(Config.ExportPath, ParentFolderUID) + Logger.Debug($"oOutputDirectoryPath is {oOutputDirectoryPath}") If Not Directory.Exists(oOutputDirectoryPath) Then + Logger.Debug($"Directory not existing. Creating ... ") Directory.CreateDirectory(oOutputDirectoryPath) End If Dim oOutputFilePath = Path.Combine(oOutputDirectoryPath, $"{oEnvelope.Uuid}.pdf") @@ -172,6 +174,7 @@ Namespace Jobs Throw New ApplicationException("Envelope could not be finalized") End If Catch ex As Exception + Logger.Error(ex) Logger.Warn(ex, $"Unhandled exception while working envelope [{oId}]") End Try diff --git a/EnvelopeGenerator.Form/frmMain.vb b/EnvelopeGenerator.Form/frmMain.vb index c1a152e4..02509f43 100644 --- a/EnvelopeGenerator.Form/frmMain.vb +++ b/EnvelopeGenerator.Form/frmMain.vb @@ -594,31 +594,40 @@ Public Class frmMain End Sub Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitm_ResendInvitation.ItemClick - Dim oView As GridView = GridEnvelopes.FocusedView - Dim selReceiver As Receiver - If oView.Name = ViewReceivers.Name Then - selReceiver = oView.GetRow(oView.FocusedRowHandle) - Else - MsgBox(Resources.Envelope.Please_select_a_recipient_from_the_Recipients_tab, MsgBoxStyle.Information, Text) - End If - If ViewEnvelopes.FocusedRowHandle < 0 Or IsNothing(selReceiver) Then - Exit Sub - End If - Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(ViewEnvelopes.FocusedRowHandle) + Dim oHandle = SplashScreenManager.ShowOverlayForm(Me) + Try + Dim oView As GridView = GridEnvelopes.FocusedView + Dim selReceiver As EnvelopeReceiver + If oView.Name = ViewReceivers.Name Then + selReceiver = oView.GetRow(oView.FocusedRowHandle) + Else + MsgBox(Resources.Envelope.Please_select_a_recipient_from_the_Recipients_tab, MsgBoxStyle.Information, Text) + End If + If ViewEnvelopes.FocusedRowHandle < 0 Or IsNothing(selReceiver) Then + Exit Sub + End If + Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(ViewEnvelopes.FocusedRowHandle) - Dim oController = New EnvelopeEditorController(State, oEnvelope) - Dim Documents As New BindingList(Of EnvelopeDocument) - Dim Receivers As New BindingList(Of Receiver) - Receivers = New BindingList(Of Receiver)(oController.Envelope.Receivers) - For Each oReceiver As Receiver In Receivers - If oReceiver.EmailAddress = selReceiver.EmailAddress Then - If oController.ActionService.ResendReceiver(oEnvelope, oReceiver) = True Then - Dim oMsg = Resources.Envelope.Invitation_successfully_resend.Replace("@Mail", oReceiver.EmailAddress) - MsgBox(oMsg, MsgBoxStyle.Information, Text) + Dim oController = New EnvelopeEditorController(State, oEnvelope) + Dim Documents As New BindingList(Of EnvelopeDocument) + Dim Receivers As New BindingList(Of EnvelopeReceiver) + Receivers = New BindingList(Of EnvelopeReceiver)(oController.Envelope.Receivers) + For Each oReceiver As EnvelopeReceiver In Receivers + If oReceiver.Email = selReceiver.Email Then + If oController.ActionService.ResendReceiver(oEnvelope, oReceiver) = True Then + Dim oMsg = Resources.Envelope.Invitation_successfully_resend.Replace("@Mail", oReceiver.Email) + MsgBox(oMsg, MsgBoxStyle.Information, Text) - End If + End If End If Next + Catch ex As Exception + Logger.Error(ex) + Finally + + + End Try + SplashScreenManager.CloseOverlayForm(oHandle) End Sub @@ -786,7 +795,7 @@ Public Class frmMain If oDT.Rows.Count = 1 Then Dim oTFA_REG_DL = oDT.Rows(0).Item("TFA_REG_DEADLINE") Dim oTOTP = oDT.Rows(0).Item("TOTP_SECRET_KEY") - Dim oForm As New frm2Factor_Properties(oReceiver.EmailAddress, oTOTP, oTFA_REG_DL, DB_DD_ECM) + Dim oForm As New frm2Factor_Properties(oReceiver.Email, oTOTP, oTFA_REG_DL, DB_DD_ECM) oForm.ShowDialog() End If End If @@ -794,6 +803,12 @@ Public Class frmMain Else MsgBox(Resources.Envelope.Please_select_a_recipient_from_the_Recipients_tab, MsgBoxStyle.Information, Text) End If + End If + End If + + Else + MsgBox(Resources.Envelope.Please_select_a_recipient_from_the_Recipients_tab, MsgBoxStyle.Information, Text) + End If End Sub Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click diff --git a/EnvelopeGenerator.Infrastructure/Executor/EnvelopeExecutor.cs b/EnvelopeGenerator.Infrastructure/Executor/EnvelopeExecutor.cs index 945f1ac7..c5147778 100644 --- a/EnvelopeGenerator.Infrastructure/Executor/EnvelopeExecutor.cs +++ b/EnvelopeGenerator.Infrastructure/Executor/EnvelopeExecutor.cs @@ -28,7 +28,7 @@ public class EnvelopeExecutor : SQLExecutor, IEnvelopeExecutor var envelopes = await connection.QueryAsync(formattedSql); var envelope = envelopes.FirstOrDefault() ?? throw new InvalidOperationException($"Envelope creation failed. Parameters:" + - $"userId={userId}, title='{title}', message='{message}', tfaEnabled={tfaEnabled}."); ; + $"userId={userId}, title='{title}', message='{message}', tfaEnabled={tfaEnabled}."); envelope.User = await _userRepository.ReadByIdAsync(envelope.UserId); diff --git a/EnvelopeGenerator.Service/Scheduler_FinishEnvelope.vb b/EnvelopeGenerator.Service/Scheduler_FinishEnvelope.vb index 50dd4675..0c73bae3 100644 --- a/EnvelopeGenerator.Service/Scheduler_FinishEnvelope.vb +++ b/EnvelopeGenerator.Service/Scheduler_FinishEnvelope.vb @@ -67,7 +67,7 @@ Public Class Scheduler_FinishEnvelope Await Scheduler.Start() - Logger.Info("Scheduler started!") + Logger.Debug("Scheduler started!") Catch ex As Exception Logger.Error(ex) End Try diff --git a/EnvelopeGenerator.Service/Service.vb b/EnvelopeGenerator.Service/Service.vb index d54aae47..5cfb9242 100644 --- a/EnvelopeGenerator.Service/Service.vb +++ b/EnvelopeGenerator.Service/Service.vb @@ -34,7 +34,7 @@ Public Class Service TempFiles.Create() ' === Initialize Databases === - Logger.Info("Inititalize Database ...") + Logger.Debug("Inititalize Database ...") If Config.ConnectionString = String.Empty Then Throw New ApplicationException("Connection String is empty!") diff --git a/EnvelopeGenerator.sln b/EnvelopeGenerator.sln index 3d36de3a..bce6cb06 100644 --- a/EnvelopeGenerator.sln +++ b/EnvelopeGenerator.sln @@ -53,8 +53,8 @@ Global {6D56C01F-D6CB-4D8A-BD3D-4FD34326998C}.Release|Any CPU.Build.0 = Debug|Any CPU {6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Release|Any CPU.ActiveCfg = Debug|Any CPU - {6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Release|Any CPU.Build.0 = Debug|Any CPU + {6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Release|Any CPU.Build.0 = Release|Any CPU {5E0E17C0-FF5A-4246-BF87-1ADD85376A27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5E0E17C0-FF5A-4246-BF87-1ADD85376A27}.Debug|Any CPU.Build.0 = Debug|Any CPU {5E0E17C0-FF5A-4246-BF87-1ADD85376A27}.Release|Any CPU.ActiveCfg = Debug|Any CPU @@ -98,7 +98,6 @@ Global GlobalSection(NestedProjects) = preSolution {089D5634-FB6B-42D0-B912-7AA7457044E7} = {0CBC2432-A561-4440-89BC-671B66A24146} {6D56C01F-D6CB-4D8A-BD3D-4FD34326998C} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB} - {6EA0C51F-C2B1-4462-8198-3DE0B32B74F8} = {9943209E-1744-4944-B1BA-4F87FC1A0EEB} {5E0E17C0-FF5A-4246-BF87-1ADD85376A27} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB} {83ED2617-B398-4859-8F59-B38F8807E83E} = {9943209E-1744-4944-B1BA-4F87FC1A0EEB} {4F32A98D-E6F0-4A09-BD97-1CF26107E837} = {9943209E-1744-4944-B1BA-4F87FC1A0EEB}