report & service fixes

EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb

@@ -111,6 +111,12 @@ Namespace Jobs
                         Throw New ApplicationException("Document could not be finalized")
                     End If
 
+                    Logger.Debug("Setting envelope status..")
+                    If ActionService.FinalizeEnvelope(oEnvelope) = False Then
+                        Logger.Warn("Envelope could not be finalized!")
+                        Throw New ApplicationException("Envelope could not be finalized")
+                    End If
+
                     Logger.Debug("Creating report..")
                     Dim oReport As Byte() = ReportCreator.CreateReport(oEnvelope)
 
@@ -126,16 +132,10 @@ Namespace Jobs
                     Try
                         File.WriteAllBytes(oOutputFilePath, oMergedDocument)
                     Catch ex As Exception
+                        Logger.Warn("Could not export final document to disk!")
                         Throw New ExportDocumentException("Could not export final document to disk!", ex)
-                        Logger.Error(ex)
                     End Try
 
-                    Logger.Debug("Setting envelope status..")
-                    If ActionService.FinalizeEnvelope(oEnvelope) = False Then
-                        Logger.Warn("Envelope could not be finalized!")
-                        Throw New ApplicationException("Envelope could not be finalized")
-                    End If
-
                     oCurrent += 1
                     Logger.Info("Envelope finalized!")
 
@@ -149,9 +149,11 @@ Namespace Jobs
             Catch ex As Exception
                 Logger.Warn("Certificate Document job failed!")
                 Logger.Error(ex)
+            Finally
+                Logger.Info("Job execution for [{0}] ended", JobId)
             End Try
 
-            Logger.Info("Job execution for [{0}] ended", JobId)
+            Return Task.FromResult(True)
         End Function
 
         Private Function MergeDocuments(pDocument As Byte(), pReport As Byte()) As Byte()

EnvelopeGenerator.Common/Jobs/FinalizeDocument/ReportItem.vb

@@ -1,4 +1,6 @@
-Public Class ReportItem
+Imports System.Windows.Forms.VisualStyles.VisualStyleElement
+
+Public Class ReportItem
 
     Public Property Envelope As Envelope
     Public Property EnvelopeId As Integer
@@ -6,6 +8,13 @@
     Public Property EnvelopeSubject As String
 
     Public Property ItemStatus As Constants.EnvelopeStatus
+    Public ReadOnly Property ItemStatusTranslated As String
+        Get
+            Dim oStatus = ItemStatus.ToString()
+            Return My.Resources.Model.ResourceManager.GetString(oStatus)
+        End Get
+    End Property
+
     Public Property ItemUserReference As String
     Public Property ItemDate As Date