From d603fcfec6b2021cc5666286fc3b9716a173dcdc Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@digitaldata.works>
Date: Mon, 4 Dec 2023 11:40:43 +0100
Subject: [PATCH] reload thumbnails after switching receivers

---
 .../Jobs/CertificateDocumentJob.vb            | 35 +++++++++++++------
 EnvelopeGenerator.Form/frmFieldEditor.vb      | 17 ++++-----
 2 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/EnvelopeGenerator.Common/Jobs/CertificateDocumentJob.vb b/EnvelopeGenerator.Common/Jobs/CertificateDocumentJob.vb
index e658ba2f..3f36a768 100644
--- a/EnvelopeGenerator.Common/Jobs/CertificateDocumentJob.vb
+++ b/EnvelopeGenerator.Common/Jobs/CertificateDocumentJob.vb
@@ -1,20 +1,35 @@
-Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.Database
+Imports DigitalData.Modules.Logging
 Imports Quartz
 
 Public Class CertificateDocumentJob
     Implements IJob
 
-    Public Function Execute(context As IJobExecutionContext) As Task Implements IJob.Execute
-        Dim connectionString As String = context.MergedJobDataMap.Item(Constants.DATABASE)
-        Dim logConfig As LogConfig = context.MergedJobDataMap.Item(Constants.LOGCONFIG)
-        Dim logger As Logger = logConfig.GetLogger
+    Public Function Execute(pContext As IJobExecutionContext) As Task Implements IJob.Execute
+        Dim oLogConfig As LogConfig = pContext.MergedJobDataMap.Item(Constants.LOGCONFIG)
+        Dim oConnectionString As String = pContext.MergedJobDataMap.Item(Constants.DATABASE)
+        Dim oLogger As Logger = oLogConfig.GetLogger()
 
-        Dim JobId = context.JobDetail.Key
-        logger.Info("Starting job {0}", JobId)
+        Try
+            Dim oDatabase As New MSSQLServer(oLogConfig, MSSQLServer.DecryptConnectionString(oConnectionString))
+            Dim JobId = pContext.JobDetail.Key
+            oLogger.Info("Starting job {0}", JobId)
 
-        ' Do important work...
+            Dim oSql = $"SELECT * FROM TBSIG_ENVELOPE WHERE STATUS = {Constants.EnvelopeStatus.EnvelopeCompletelySigned}"
+            Dim oTable = oDatabase.GetDatatable(oSql)
 
-        logger.Info("Completed job {0}", JobId)
-        Return Task.FromResult(True)
+            oLogger.Info("Found [{0}] completed envelopes.", oTable.Rows.Count)
+
+            ' Do important work...
+
+            oLogger.Info("Completed job {0}", JobId)
+            Return Task.FromResult(True)
+
+        Catch ex As Exception
+            oLogger.Warn("Certificate Document job failed!")
+            oLogger.Error(ex)
+
+            Return Task.FromException(ex)
+        End Try
     End Function
 End Class
diff --git a/EnvelopeGenerator.Form/frmFieldEditor.vb b/EnvelopeGenerator.Form/frmFieldEditor.vb
index 8bf5987e..568d1ebd 100644
--- a/EnvelopeGenerator.Form/frmFieldEditor.vb
+++ b/EnvelopeGenerator.Form/frmFieldEditor.vb
@@ -62,11 +62,9 @@ Partial Public Class frmFieldEditor
             For Each oReceiver In Receivers
                 LoadAnnotations(oReceiver.Id)
             Next
-            'LoadAnnotations(SelectedReceiver.Id)
             GDViewer.DisplayFirstPage()
 
             ThumbnailEx2.LoadFromGdViewer(GDViewer)
-            ThumbnailEx2.Refresh()
         End If
     End Sub
 
@@ -76,6 +74,9 @@ Partial Public Class frmFieldEditor
 
         If DocumentViewer1.PdfViewer IsNot Nothing Then
             GDViewer = DocumentViewer1.PdfViewer
+            AddHandler GDViewer.BeforeAnnotationAddedByUser, AddressOf Viewer_BeforeAnnotationAddedByUser
+            AddHandler GDViewer.AnnotationAddedByUser, AddressOf Viewer_AnnotationAddedByUser
+
             Manager = GDViewer.GetAnnotationManager()
             Manager.InitFromGdViewer(GDViewer)
         Else
@@ -95,8 +96,6 @@ Partial Public Class frmFieldEditor
         Return oItem
     End Function
 
-
-
     Private Sub ReceiverItem_Click(sender As Object, e As ItemClickEventArgs)
         Me.SuspendLayout()
 
@@ -122,6 +121,8 @@ Partial Public Class frmFieldEditor
             DisplayPage(oCurrentPage)
             GDViewer.SetVScrollBarPosition(oCurrentPosition)
             GDViewer.Redraw()
+            ThumbnailEx2.ReloadThumbnails()
+
             TestViewerActionSuccessful("ReceiverItem_Click/Redraw")
         Else
             MsgBox(Resources.Envelope.Elements_could_not_be_saved, MsgBoxStyle.Critical, Text)
@@ -144,22 +145,16 @@ Partial Public Class frmFieldEditor
         GDViewer.LockViewer = False
     End Sub
 
-
     Private Sub BarButtonItem1_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem1.ItemClick
         If GDViewer IsNot Nothing Then
-
-            AddHandler GDViewer.BeforeAnnotationAddedByUser, AddressOf Viewer_BeforeAnnotationAddedByUser
-            AddHandler GDViewer.AnnotationAddedByUser, AddressOf Viewer_AnnotationAddedByUser
-
             GDViewer.AddStickyNoteAnnotationInteractive(SIGNATURE_LABEL, Color.Black, "Arial", FontStyle.Regular, 10, 1, 0)
-
-
         End If
     End Sub
 
     Private Sub Viewer_BeforeAnnotationAddedByUser(pAnnotationIdx As Integer)
         Dim oAnnotation As Annotation = GDViewer.GetAnnotationFromIdx(pAnnotationIdx)
         ApplyAnnotationStyleForNewAnnotation(oAnnotation, SelectedReceiver.Color)
+
     End Sub
 
     Private Sub btnSave_ItemClick(sender As Object, e As ItemClickEventArgs) Handles btnSave.ItemClick