From 8bd7ab13d0e91622096e332521b9827e858bbe65 Mon Sep 17 00:00:00 2001 From: Developer 02 Date: Tue, 16 Jul 2024 13:55:36 +0200 Subject: [PATCH] =?UTF-8?q?Liste=20f=C3=BCr=20ignorierte=20Etiketten=20ers?= =?UTF-8?q?tellt=20und=20zu=20den=20Diensten=20hinzugef=C3=BCgt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EnvelopeGenerator.Common/Constants.vb | 1 + .../Jobs/FinalizeDocument/FinalizeDocumentJob.vb | 11 ++--------- .../Jobs/FinalizeDocument/PDFBurner.vb | 5 ++++- EnvelopeGenerator.Service/Config.vb | 2 ++ EnvelopeGenerator.Service/Scheduler.vb | 7 +++++-- EnvelopeGenerator.Service/Service.vb | 2 +- EnvelopeGenerator.Test/frmFinalizePDF.vb | 3 ++- 7 files changed, 17 insertions(+), 14 deletions(-) diff --git a/EnvelopeGenerator.Common/Constants.vb b/EnvelopeGenerator.Common/Constants.vb index 9b8ce7ed..2d7c26e5 100644 --- a/EnvelopeGenerator.Common/Constants.vb +++ b/EnvelopeGenerator.Common/Constants.vb @@ -102,6 +102,7 @@ Public Const DATABASE = "DATABASE" Public Const LOGCONFIG = "LOGCONFIG" Public Const GDPICTURE = "GDPICTURE" + Public Const IGNORED_LABELS = "IgnoredLabels" Public Const GREEN_300 = "#bbf7d0" Public Const RED_300 = "#fecaca" diff --git a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb b/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb index 4ca0f86a..0f7ae28b 100644 --- a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb +++ b/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb @@ -7,17 +7,9 @@ Imports System.Security.Cryptography Imports System.IO Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument.FinalizeDocumentExceptions Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument -Imports EnvelopeGenerator.Common.My.Resources Imports EnvelopeGenerator.Common.Constants -Imports DevExpress.XtraBars.Docking -Imports System.ServiceModel -Imports DevExpress.XtraRichEdit.Export -Imports DevExpress.Pdf.Native.BouncyCastle.Asn1.Cms -Imports DevExpress.DataAccess.Sql Imports DevExpress.DataProcessing -Imports Quartz.Logging.OperationName Imports System.Data.SqlClient -Imports System.Windows.Forms Namespace Jobs Public Class FinalizeDocumentJob @@ -82,7 +74,8 @@ Namespace Jobs InitializeServices(oState) Logger.Debug("Loading PDFBurner..") - PDFBurner = New PDFBurner(LogConfig, oGdPictureKey) + Dim ignoredLabels As List(Of String) = pContext.MergedJobDataMap.Item(Constants.IGNORED_LABELS) + PDFBurner = New PDFBurner(LogConfig, oGdPictureKey, ignoredLabels) Logger.Debug("Loading PDFMerger..") PDFMerger = New PDFMerger(LogConfig, oGdPictureKey) diff --git a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/PDFBurner.vb b/EnvelopeGenerator.Common/Jobs/FinalizeDocument/PDFBurner.vb index df85cf87..cc773cd1 100644 --- a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/PDFBurner.vb +++ b/EnvelopeGenerator.Common/Jobs/FinalizeDocument/PDFBurner.vb @@ -16,14 +16,17 @@ Namespace Jobs.FinalizeDocument Private Const ANNOTATION_TYPE_IMAGE = "pspdfkit/image" Private Const ANNOTATION_TYPE_INK = "pspdfkit/ink" Private Const ANNOTATION_TYPE_WIDGET = "pspdfkit/widget" + Private Property _ignoredLabels As List(Of String) - Public Sub New(pLogConfig As LogConfig, pGDPictureLicenseKey As String) + Public Sub New(pLogConfig As LogConfig, pGDPictureLicenseKey As String, ignoredLabels As List(Of String)) MyBase.New(pLogConfig) LicenseManager = New LicenseManager() LicenseManager.RegisterKEY(pGDPictureLicenseKey) Manager = New AnnotationManager() + + _ignoredLabels = ignoredLabels End Sub Public Function BurnInstantJSONAnnotationsToPDF(pSourceBuffer As Byte(), pInstantJSONList As List(Of String)) As Byte() diff --git a/EnvelopeGenerator.Service/Config.vb b/EnvelopeGenerator.Service/Config.vb index 31e2bf4f..28118a25 100644 --- a/EnvelopeGenerator.Service/Config.vb +++ b/EnvelopeGenerator.Service/Config.vb @@ -6,4 +6,6 @@ Public Class Config Public Property Debug As Boolean = False Public Property IntervalInMin As Integer = 1 + + Public Property IgnoredLabels As List(Of String) = New List(Of String) From {"Date", "Datum", "ZIP", "PLZ", "Place", "Ort"} End Class diff --git a/EnvelopeGenerator.Service/Scheduler.vb b/EnvelopeGenerator.Service/Scheduler.vb index aab000f0..98b30906 100644 --- a/EnvelopeGenerator.Service/Scheduler.vb +++ b/EnvelopeGenerator.Service/Scheduler.vb @@ -11,13 +11,15 @@ Public Class Scheduler Private Scheduler As IScheduler Private ReadOnly ConnectionString As String Private ReadOnly LicenseKey As String + Private Property _ignoredLabels As List(Of String) Private Const JobName = "CertificateDocumentJob" - Public Sub New(pLogConfig As LogConfig, pConnectionString As String, pLicenseKey As String) + Public Sub New(pLogConfig As LogConfig, pConnectionString As String, pLicenseKey As String, ignoredLabels As List(Of String)) MyBase.New(pLogConfig) ConnectionString = pConnectionString LicenseKey = pLicenseKey + _ignoredLabels = ignoredLabels Dim oLogProvider = New LogProvider(Logger) Logging.LogProvider.SetCurrentLogProvider(oLogProvider) @@ -36,7 +38,8 @@ Public Class Scheduler Dim oJobData = New JobDataMap() From { {Common.Constants.GDPICTURE, LicenseKey}, {Common.Constants.LOGCONFIG, LogConfig}, - {Common.Constants.DATABASE, ConnectionString} + {Common.Constants.DATABASE, ConnectionString}, + {Common.Constants.IGNORED_LABELS, _ignoredLabels} } Logger.Debug("Initialized Job [{0}]", JobName) diff --git a/EnvelopeGenerator.Service/Service.vb b/EnvelopeGenerator.Service/Service.vb index 828162e8..0d69b896 100644 --- a/EnvelopeGenerator.Service/Service.vb +++ b/EnvelopeGenerator.Service/Service.vb @@ -59,7 +59,7 @@ Public Class Service Logger.Debug("Inititalize Quartz") - Scheduler = New Scheduler(LogConfig, Config.ConnectionString, oKey) + Scheduler = New Scheduler(LogConfig, Config.ConnectionString, oKey, Config.IgnoredLabels) Await Scheduler.Start(Config.IntervalInMin) Logger.Info("Started [{0}] !", ServiceName) diff --git a/EnvelopeGenerator.Test/frmFinalizePDF.vb b/EnvelopeGenerator.Test/frmFinalizePDF.vb index 7608dd35..f65f82b7 100644 --- a/EnvelopeGenerator.Test/frmFinalizePDF.vb +++ b/EnvelopeGenerator.Test/frmFinalizePDF.vb @@ -15,13 +15,14 @@ Public Class frmFinalizePDF Private Manager As AnnotationManager Private PDFBurner As FinalizeDocument.PDFBurner Private pGDPictureLicenseKey As String = "21182889975216572111813147150675976632" + Private ReadOnly _ignoredLabels As New List(Of String) From {"Date", "Datum", "ZIP", "PLZ", "Place", "Ort"} Private Sub frmFinalizePDF_Load(sender As Object, e As EventArgs) Handles MyBase.Load LogConfig = New LogConfig(LogConfig.PathType.CustomPath, Application.StartupPath) Database = New MSSQLServer(LogConfig, MSSQLServer.DecryptConnectionString(CONNECTIONSTRING)) - PDFBurner = New FinalizeDocument.PDFBurner(LogConfig, pGDPictureLicenseKey) + PDFBurner = New FinalizeDocument.PDFBurner(LogConfig, pGDPictureLicenseKey, _ignoredLabels) Viewer = New GdViewer() Manager = New AnnotationManager()