Compare commits

...

3 Commits

Author SHA1 Message Date
Jonathan Jenne
ac3bbc79f3 prepare dynamic subjects 2023-12-04 12:29:40 +01:00
Jonathan Jenne
859e971b26 Merge branch 'master' of http://git.dd:3000/AppStd/EnvelopeGenerator 2023-12-04 12:27:18 +01:00
Jonathan Jenne
d603fcfec6 reload thumbnails after switching receivers 2023-12-04 11:40:43 +01:00
3 changed files with 61 additions and 23 deletions

View File

@@ -6,13 +6,26 @@ Public Class EmailTemplate
Private _DocumentCompletedBodyTemplate As List(Of String)
Private _DocumentDeletedBodyTemplate As List(Of String)
Private _DocumentReceivedSubjectTemplate As String
Private _DocumentSignedSubjectTemplate As String
Private _DocumentDeletedSubjectTemplate As String
Private _DocumentCompletedSubjectTemplate As String
Private _replaceDictionary As Dictionary(Of String, String)
Public Sub New()
InitTemplates()
InitBodyTemplates()
InitSubjectTemplates()
End Sub
Private Sub InitTemplates()
Private Sub InitSubjectTemplates()
_DocumentReceivedSubjectTemplate = "Dokument zur Unterschrift erhalten: '<DOCUMENT_TITLE>'"
_DocumentSignedSubjectTemplate = "Dokument unterschrieben: '<DOCUMENT_TITLE>'"
_DocumentDeletedSubjectTemplate = "Dokument zurueckgezogen: '<DOCUMENT_TITLE>'"
_DocumentCompletedSubjectTemplate = "Dokument abgeschlossen: '<DOCUMENT_TITLE>'"
End Sub
Private Sub InitBodyTemplates()
_DocumentReceivedBodyTemplate = New List(Of String) From {
"Guten Tag, <NAME_RECEIVER>,",
"",
@@ -82,6 +95,21 @@ Public Class EmailTemplate
FillEmailBody(pEmailData, _DocumentCompletedBodyTemplate)
End Sub
Public Sub FillEmailSubject(pEmailData As EmailData, pTemplate As String)
InitDictionary(pEmailData)
Dim resultSubject As String = pTemplate
For Each dictItem As KeyValuePair(Of String, String) In _replaceDictionary
If resultSubject.Contains(dictItem.Key) Then
resultSubject = resultSubject.Replace(dictItem.Key, dictItem.Value)
End If
Next
End Sub
Public Sub FillEmailBody(pEmailData As EmailData, pTemplate As List(Of String))
InitDictionary(pEmailData)

View File

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

View File

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