diff --git a/.gitignore b/.gitignore
index 3c4efe20..61494a68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -258,4 +258,13 @@ paket-files/
# Python Tools for Visual Studio (PTVS)
__pycache__/
-*.pyc
\ No newline at end of file
+*.pyc
+/GUIs.Test.ZUGFeRDTest/Form1.vb
+/GUIs.Test.ZUGFeRDTest/Form1.resx
+/GUIs.Test.ZUGFeRDTest/Form1.Designer.vb
+/GUIs.Test.ZUGFeRDTest/Form1.vb
+/GUIs.Test.ZUGFeRDTest/Form1.resx
+/GUIs.Test.ZUGFeRDTest/Form1.Designer.vb
+/GUIs.Test.ZUGFeRDTest/Form1.vb
+/GUIs.Test.ZUGFeRDTest/Form1.resx
+/GUIs.Test.ZUGFeRDTest/Form1.Designer.vb
diff --git a/GUIs.Test.ZUGFeRDTest/App.config b/GUIs.Test.ZUGFeRDTest/App.config
index 10e6d67e..b9eee8df 100644
--- a/GUIs.Test.ZUGFeRDTest/App.config
+++ b/GUIs.Test.ZUGFeRDTest/App.config
@@ -1,15 +1,15 @@
-
+
-
+
-
+
-
+
@@ -30,7 +30,7 @@
dd
-
+
Server=SDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM_TEST;User Id=sa;Password=dd
@@ -40,73 +40,73 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
\ No newline at end of file
+
diff --git a/GUIs.Test.ZUGFeRDTest/Form1.vb b/GUIs.Test.ZUGFeRDTest/Form1.vb
index 91cb7341..0cb5925b 100644
--- a/GUIs.Test.ZUGFeRDTest/Form1.vb
+++ b/GUIs.Test.ZUGFeRDTest/Form1.vb
@@ -59,8 +59,8 @@ Public Class Form1
Return args
End Function
- Private Function LoadPropertyMapFor(Args As WorkerArgs, Specification As String)
- Dim oSQL As String = $"SELECT * FROM TBEDM_XML_ITEMS WHERE SPECIFICATION = '{Specification}' AND ACTIVE = True ORDER BY XML_PATH"
+ Private Function LoadPropertyMapFor(Args As WorkerArgs)
+ Dim oSQL As String = $"SELECT * FROM TBEDM_XML_ITEMS WHERE ACTIVE = True ORDER BY XML_PATH"
Dim oResult As DataTable = _firebird.GetDatatable(oSQL)
For Each oRow As DataRow In oResult.Rows
@@ -71,6 +71,7 @@ Public Class Form1
Dim isRequired = oRow.Item("IS_REQUIRED")
Dim isGrouped = oRow.Item("IS_GROUPED")
Dim groupScope = oRow.Item("GROUP_SCOPE")
+ Dim specification = oRow.Item("SPECIFICATION")
Args.PropertyMap.Add(xmlPath, New XmlItemProperty() With {
.Description = description,
@@ -78,7 +79,8 @@ Public Class Form1
.TableColumn = tableColumn,
.IsRequired = isRequired,
.IsGrouped = isGrouped,
- .GroupScope = groupScope
+ .GroupScope = groupScope,
+ .Specification = specification
})
Next
@@ -92,10 +94,10 @@ Public Class Form1
.NamePortal = "TEST FROM FORM"
}
args = LoadFolderConfig(args)
- args = LoadPropertyMapFor(args, "DEFAULT")
+ args = LoadPropertyMapFor(args)
args.InsertIntoSQLServer = True
- Dim job As New Jobs.ImportZUGFeRDFiles(_logConfig, _firebird, 1, "TEST", _mssql)
+ Dim job As New Jobs.ImportZUGFeRDFiles(_logConfig, _firebird, _mssql)
job.Start(args)
End Sub
@@ -115,17 +117,29 @@ Public Class Form1
End If
End Sub
- Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
- Dim oResult = OpenFileDialog1.ShowDialog()
- Dim oArgs As New WorkerArgs()
- oArgs = LoadPropertyMapFor(oArgs, "DEFAULT")
+ Public Sub WriteLog(pMessage As String, ParamArray pParams As String())
+ ListBox1.Items.Add(String.Format(pMessage, pParams))
+ End Sub
- If oResult = DialogResult.OK Then
+ Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
+ Dim oDialogResult = OpenFileDialog1.ShowDialog()
+ Dim oArgs As New WorkerArgs()
+ oArgs = LoadPropertyMapFor(oArgs)
+
+ If oDialogResult = DialogResult.OK Then
Dim oDoc = _zugferd.ValidateZUGFeRDFileWithGDPicture(OpenFileDialog1.FileName)
- Dim oZUGFERD = _zugferd.SerializeZUGFeRDDocument(oDoc)
+ Dim oResult = _zugferd.SerializeZUGFeRDDocument(oDoc)
Console.WriteLine()
- Dim oResult2 = _zugferd.PropertyValues.CheckPropertyValues(oZUGFERD, oArgs.PropertyMap, "test")
+ Dim oPropertyMap = oArgs.PropertyMap.
+ Where(Function(kv) kv.Value.Specification = oResult.Specification).
+ ToDictionary(Function(kv) kv.Key, Function(kv) kv.Value)
+
+ Dim oResult2 = _zugferd.PropertyValues.CheckPropertyValues(oResult.SchemaObject, oPropertyMap, "test")
+
+ For Each Prop In oResult2.MissingProperties
+ WriteLog("Missing Property: [{0}]", Prop)
+ Next
Console.WriteLine()
End If
diff --git a/GUIs.Test.ZUGFeRDTest/My Project/Application.Designer.vb b/GUIs.Test.ZUGFeRDTest/My Project/Application.Designer.vb
index de02c577..7a03956b 100644
--- a/GUIs.Test.ZUGFeRDTest/My Project/Application.Designer.vb
+++ b/GUIs.Test.ZUGFeRDTest/My Project/Application.Designer.vb
@@ -1,10 +1,10 @@
'------------------------------------------------------------------------------
'
-' This code was generated by a tool.
-' Runtime Version:4.0.30319.42000
+' Dieser Code wurde von einem Tool generiert.
+' Laufzeitversion:4.0.30319.42000
'
-' Changes to this file may cause incorrect behavior and will be lost if
-' the code is regenerated.
+' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+' der Code erneut generiert wird.
'
'------------------------------------------------------------------------------
@@ -13,15 +13,15 @@ Option Explicit On
Namespace My
-
- 'NOTE: This file is auto-generated; do not modify it directly. To make changes,
- ' or if you encounter build errors in this file, go to the Project Designer
- ' (go to Project Properties or double-click the My Project node in
- ' Solution Explorer), and make changes on the Application tab.
+
+ 'HINWEIS: Diese Datei wird automatisch generiert und darf nicht direkt bearbeitet werden. Wenn Sie Änderungen vornehmen möchten
+ ' oder in dieser Datei Buildfehler auftreten, wechseln Sie zum Projekt-Designer.
+ ' (Wechseln Sie dazu zu den Projekteigenschaften, oder doppelklicken Sie auf den Knoten "Mein Projekt" im
+ ' Projektmappen-Explorer). Nehmen Sie auf der Registerkarte "Anwendung" entsprechende Änderungen vor.
'
Partial Friend Class MyApplication
-
- _
+
+ _
Public Sub New()
MyBase.New(Global.Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows)
Me.IsSingleInstance = false
@@ -29,8 +29,8 @@ Namespace My
Me.SaveMySettingsOnExit = true
Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses
End Sub
-
- _
+
+ _
Protected Overrides Sub OnCreateMainForm()
Me.MainForm = Global.ZUGFeRDTest.Form1
End Sub
diff --git a/GUIs.Test.ZUGFeRDTest/My Project/Resources.Designer.vb b/GUIs.Test.ZUGFeRDTest/My Project/Resources.Designer.vb
index 278cab1a..86b9648a 100644
--- a/GUIs.Test.ZUGFeRDTest/My Project/Resources.Designer.vb
+++ b/GUIs.Test.ZUGFeRDTest/My Project/Resources.Designer.vb
@@ -1,40 +1,41 @@
'------------------------------------------------------------------------------
'
-' This code was generated by a tool.
-' Runtime Version:4.0.30319.42000
+' Dieser Code wurde von einem Tool generiert.
+' Laufzeitversion:4.0.30319.42000
'
-' Changes to this file may cause incorrect behavior and will be lost if
-' the code is regenerated.
+' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+' der Code erneut generiert wird.
'
'------------------------------------------------------------------------------
Option Strict On
Option Explicit On
+Imports System
Namespace My.Resources
-
- 'This class was auto-generated by the StronglyTypedResourceBuilder
- 'class via a tool like ResGen or Visual Studio.
- 'To add or remove a member, edit your .ResX file then rerun ResGen
- 'with the /str option, or rebuild your VS project.
+
+ 'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+ '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+ 'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+ 'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
'''
- ''' A strongly-typed resource class, for looking up localized strings, etc.
+ ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
'''
- _
+ _
Friend Module Resources
-
+
Private resourceMan As Global.System.Resources.ResourceManager
-
+
Private resourceCulture As Global.System.Globalization.CultureInfo
-
+
'''
- ''' Returns the cached ResourceManager instance used by this class.
+ ''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
'''
- _
+ _
Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
Get
If Object.ReferenceEquals(resourceMan, Nothing) Then
@@ -44,17 +45,17 @@ Namespace My.Resources
Return resourceMan
End Get
End Property
-
+
'''
- ''' Overrides the current thread's CurrentUICulture property for all
- ''' resource lookups using this strongly typed resource class.
+ ''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+ ''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
'''
- _
+ _
Friend Property Culture() As Global.System.Globalization.CultureInfo
Get
Return resourceCulture
End Get
- Set(ByVal value As Global.System.Globalization.CultureInfo)
+ Set
resourceCulture = value
End Set
End Property
diff --git a/GUIs.Test.ZUGFeRDTest/My Project/Settings.Designer.vb b/GUIs.Test.ZUGFeRDTest/My Project/Settings.Designer.vb
index cd5d5d47..09e1823e 100644
--- a/GUIs.Test.ZUGFeRDTest/My Project/Settings.Designer.vb
+++ b/GUIs.Test.ZUGFeRDTest/My Project/Settings.Designer.vb
@@ -15,7 +15,7 @@ Option Explicit On
Namespace My
_
Partial Friend NotInheritable Class MySettings
Inherits Global.System.Configuration.ApplicationSettingsBase
diff --git a/GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj b/GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj
index 3440a8ef..e34fd32e 100644
--- a/GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj
+++ b/GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj
@@ -11,8 +11,9 @@
ZUGFeRDTest
512
WindowsForms
- v4.6.1
+ v4.8
true
+
AnyCPU
@@ -47,7 +48,7 @@
On
-
+
False
..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll
@@ -67,15 +68,14 @@
..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll
-
- ..\packages\NLog.4.7.10\lib\net45\NLog.dll
+
+ ..\packages\NLog.5.1.0\lib\net46\NLog.dll
-
@@ -111,6 +111,7 @@
True
Application.myapp
+ True
True
diff --git a/GUIs.Test.ZUGFeRDTest/packages.config b/GUIs.Test.ZUGFeRDTest/packages.config
index f5252b7d..068365d4 100644
--- a/GUIs.Test.ZUGFeRDTest/packages.config
+++ b/GUIs.Test.ZUGFeRDTest/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file