diff --git a/Modules.Interfaces/ZUGFeRDInterface/PropertyValues.vb b/Modules.Interfaces/ZUGFeRDInterface/PropertyValues.vb index 93fe03a6..eaec6155 100644 --- a/Modules.Interfaces/ZUGFeRDInterface/PropertyValues.vb +++ b/Modules.Interfaces/ZUGFeRDInterface/PropertyValues.vb @@ -54,6 +54,7 @@ Public Class PropertyValues ' Iterate through groups to get group scope and group items For Each oGroup In oGroupedProperties Dim oGroupScope As String = oGroup.Key + Dim oPropertyList As New Dictionary(Of XmlItemProperty, List(Of Object)) Dim oRowCount = 0 @@ -117,7 +118,7 @@ Public Class PropertyValues oPropertyValue = String.Empty End If - _logger.Debug("ItemSpecification [{0}] has value '{1}'", oTableColumn, oPropertyValue) + _logger.Debug("ItemSpecification [{0}] has value '{1}'", oTableColumn, oPropertyValue) oResult.ValidProperties.Add(New ValidProperty() With { .MessageId = MessageId, diff --git a/Services.ZUGFeRDService/My Project/AssemblyInfo.vb b/Services.ZUGFeRDService/My Project/AssemblyInfo.vb index 35871653..0552ba1f 100644 --- a/Services.ZUGFeRDService/My Project/AssemblyInfo.vb +++ b/Services.ZUGFeRDService/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/Services.ZUGFeRDService/ThreadRunner.vb b/Services.ZUGFeRDService/ThreadRunner.vb index 94a6eea3..50c435ed 100644 --- a/Services.ZUGFeRDService/ThreadRunner.vb +++ b/Services.ZUGFeRDService/ThreadRunner.vb @@ -174,19 +174,21 @@ Public Class ThreadRunner Dim oResult As DataTable = _firebird.GetDatatable(oSQL) For Each row As DataRow In oResult.Rows - Dim xmlPath = row.Item("XML_PATH") - Dim tableName = row.Item("TABLE_NAME") - Dim description = row.Item("DESCRIPTION") - Dim isRequired = row.Item("IS_REQUIRED") - Dim isGrouped = row.Item("IS_GROUPED") - Dim groupScope = row.Item("GROUP_SCOPE") + Dim oXmlPath = row.Item("XML_PATH") + Dim oTableName = row.Item("TABLE_NAME") + Dim oTableColumn = row.Item("TABLE_COLUMN") + Dim oDescription = row.Item("DESCRIPTION") + Dim oIsRequired = row.Item("IS_REQUIRED") + Dim oIsGrouped = row.Item("IS_GROUPED") + Dim oGroupScope = row.Item("GROUP_SCOPE") - args.PropertyMap.Add(xmlPath, New XmlItemProperty() With { - .Description = description, - .TableName = tableName, - .IsRequired = isRequired, - .IsGrouped = isGrouped, - .GroupScope = groupScope + args.PropertyMap.Add(oXmlPath, New XmlItemProperty() With { + .Description = oDescription, + .TableName = oTableName, + .TableColumn = oTableColumn, + .IsRequired = oIsRequired, + .IsGrouped = oIsGrouped, + .GroupScope = oGroupScope }) Next