diff --git a/Jobs/Exceptions.vb b/Jobs/Exceptions.vb index d400e9fa..204fcc04 100644 --- a/Jobs/Exceptions.vb +++ b/Jobs/Exceptions.vb @@ -1,5 +1,6 @@ Imports System.Collections.Generic Imports System.IO +Imports DigitalData.Modules.Interfaces.PropertyValues Imports DigitalData.Modules.Interfaces.ZUGFeRDInterface Public Class Exceptions @@ -7,9 +8,9 @@ Public Class Exceptions Inherits ApplicationException Public ReadOnly File As FileInfo - Public ReadOnly MissingProperties As List(Of String) + Public ReadOnly MissingProperties As List(Of MissingProperty) - Public Sub New(pFile As FileInfo, pMissingProperties As List(Of String)) + Public Sub New(pFile As FileInfo, pMissingProperties As List(Of MissingProperty)) MyBase.New($"Missing values in [{pFile.Name}]") Me.File = pFile diff --git a/Jobs/ZUGFeRD/EmailFunctions.vb b/Jobs/ZUGFeRD/EmailFunctions.vb index 53f88043..419382d2 100644 --- a/Jobs/ZUGFeRD/EmailFunctions.vb +++ b/Jobs/ZUGFeRD/EmailFunctions.vb @@ -7,6 +7,7 @@ Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Jobs.ImportZUGFeRDFiles Imports System.Data.SqlClient Imports FirebirdSql.Data +Imports DigitalData.Modules.Interfaces.PropertyValues Namespace ZUGFeRD Public Class EmailFunctions @@ -274,7 +275,7 @@ Namespace ZUGFeRD Return oRandomValue End Function - Public Function CreateBodyForMissingProperties(OriginalFilename As String, MissingProperties As List(Of String)) As String + Public Function CreateBodyForMissingProperties(OriginalFilename As String, MissingProperties As List(Of MissingProperty)) As String Dim oBody = String.Format(EmailStrings.EMAIL_MISSINGPROPERTIES_1, OriginalFilename) If MissingProperties.Count > 0 Then @@ -283,7 +284,7 @@ Namespace ZUGFeRD oBody &= $"{vbNewLine}{vbNewLine}" For Each prop In MissingProperties - oBody &= $"- {prop}" + oBody &= $"- {prop.Description}" Next End If diff --git a/Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb b/Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb index c8e675b7..ace9563a 100644 --- a/Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb +++ b/Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb @@ -7,6 +7,7 @@ Imports DigitalData.Modules.Base Imports DigitalData.Modules.Database Imports DigitalData.Modules.Interfaces Imports DigitalData.Modules.Interfaces.Exceptions +Imports DigitalData.Modules.Interfaces.PropertyValues Imports DigitalData.Modules.Jobs.Exceptions Imports DigitalData.Modules.Logging @@ -82,7 +83,7 @@ Public Class ImportZUGFeRDFiles Public Sub Start(Arguments As Object) Implements IJob.Start Dim oArgs As WorkerArgs = Arguments - Dim oPropertyExtractor = New PropertyValues(_logConfig) + 'Dim oPropertyExtractor = New PropertyValues(_logConfig) Dim oAttachmentExtractor = New PDFEmbeds(_logConfig) _EmailOutAccountId = oArgs.EmailOutProfileId @@ -314,7 +315,7 @@ Public Class ImportZUGFeRDFiles Dim oMissingFieldList As String = "" For Each oMissingFieldDescription In ex.MissingProperties - oMissingFieldList += $"