AppStd/Monorepo
8
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/Monorepo

Browse Source
This commit is contained in:
OlgunR 2025-08-12 10:24:24 +02:00
commit 92bc4c37c7
26 changed files with 368 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Controls.DocumentViewer/DocumentViewer.Designer.vb generated
View File

@ -63,6 +63,7 @@ Partial Class DocumentViewer
Me.SpreadsheetControl1 = New DevExpress.XtraSpreadsheet.SpreadsheetControl() Me.SpreadsheetControl1 = New DevExpress.XtraSpreadsheet.SpreadsheetControl()
Me.PrintDocument1 = New System.Drawing.Printing.PrintDocument() Me.PrintDocument1 = New System.Drawing.Printing.PrintDocument()
Me.lbFileNotLoaded = New DevExpress.XtraEditors.LabelControl() Me.lbFileNotLoaded = New DevExpress.XtraEditors.LabelControl()
Me.RichEditControl1 = New DevExpress.XtraRichEdit.RichEditControl()
CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.RepositoryItemTextEdit2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemTextEdit2, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.RepositoryItemTextEdit3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemTextEdit3, System.ComponentModel.ISupportInitialize).BeginInit()
@ -421,7 +422,7 @@ Partial Class DocumentViewer
' '
'SpreadsheetControl1 'SpreadsheetControl1
' '
Me.SpreadsheetControl1.Location = New System.Drawing.Point(316, 270) Me.SpreadsheetControl1.Location = New System.Drawing.Point(147, 190)
Me.SpreadsheetControl1.MenuManager = Me.BarManager1 Me.SpreadsheetControl1.MenuManager = Me.BarManager1
Me.SpreadsheetControl1.Name = "SpreadsheetControl1" Me.SpreadsheetControl1.Name = "SpreadsheetControl1"
Me.SpreadsheetControl1.ReadOnly = True Me.SpreadsheetControl1.ReadOnly = True
@ -450,10 +451,20 @@ Partial Class DocumentViewer
Me.lbFileNotLoaded.Text = "Die Datei konnte nicht geladen werden" Me.lbFileNotLoaded.Text = "Die Datei konnte nicht geladen werden"
Me.lbFileNotLoaded.Visible = False Me.lbFileNotLoaded.Visible = False
' '
'RichEditControl1
'
Me.RichEditControl1.Location = New System.Drawing.Point(571, 238)
Me.RichEditControl1.MenuManager = Me.BarManager1
Me.RichEditControl1.Name = "RichEditControl1"
Me.RichEditControl1.Size = New System.Drawing.Size(400, 200)
Me.RichEditControl1.TabIndex = 5
Me.RichEditControl1.Visible = False
'
'DocumentViewer 'DocumentViewer
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.Controls.Add(Me.RichEditControl1)
Me.Controls.Add(Me.lbFileNotLoaded) Me.Controls.Add(Me.lbFileNotLoaded)
Me.Controls.Add(Me.SpreadsheetControl1) Me.Controls.Add(Me.SpreadsheetControl1)
Me.Controls.Add(Me.GdViewer) Me.Controls.Add(Me.GdViewer)
@ -514,4 +525,5 @@ Partial Class DocumentViewer
Friend WithEvents lbFileNotLoaded As DevExpress.XtraEditors.LabelControl Friend WithEvents lbFileNotLoaded As DevExpress.XtraEditors.LabelControl
Friend WithEvents btnSearch As DevExpress.XtraBars.BarButtonItem Friend WithEvents btnSearch As DevExpress.XtraBars.BarButtonItem
Friend WithEvents btnSearch2 As DevExpress.XtraBars.BarButtonItem Friend WithEvents btnSearch2 As DevExpress.XtraBars.BarButtonItem
Friend WithEvents RichEditControl1 As DevExpress.XtraRichEdit.RichEditControl
End Class End Class

40
Controls.DocumentViewer/DocumentViewer.resx
View File

@ -161,26 +161,6 @@
NC42LTAuOCw2LjUtMi4xbDcuOSw3LjljMC4zLDAuMywwLjksMC4zLDEuMiwwbDEuMi0xLjJDMzAuMSwy NC42LTAuOCw2LjUtMi4xbDcuOSw3LjljMC4zLDAuMywwLjksMC4zLDEuMiwwbDEuMi0xLjJDMzAuMSwy
OC4yLDMwLjEsMjcuNiwyOS43LDI3LjN6IE00LDEzYzAtNSw0LTksOS05YzUsMCw5LDQsOSw5ICAgcy00 OC4yLDMwLjEsMjcuNiwyOS43LDI3LjN6IE00LDEzYzAtNSw0LTksOS05YzUsMCw5LDQsOSw5ICAgcy00
LDktOSw5QzgsMjIsNCwxOCw0LDEzeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L LDktOSw5QzgsMjIsNCwxOCw0LDEzeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L
</value>
</data>
<data name="btnSearch2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANoCAAAC77u/
PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9Ilpvb20iPg0KICAgIDxwYXRoIGQ9Ik0yNy43LDI1LjNM
MjAuNSwxOGMxLTEuNCwxLjUtMy4yLDEuNS01YzAtNS00LTktOS05cy05LDQtOSw5YzAsNSw0LDksOSw5
YzEuOSwwLDMuNi0wLjYsNS0xLjVsNy4zLDcuMyAgIGMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsMS4yLTEu
MkMyOC4xLDI2LjIsMjguMSwyNS42LDI3LjcsMjUuM3ogTTYsMTNjMC0zLjksMy4xLTcsNy03czcsMy4x
LDcsN2MwLDMuOS0zLjEsNy03LDdTNiwxNi45LDYsMTN6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4N
Cjwvc3ZnPgs=
</value> </value>
</data> </data>
<data name="btnPrevHighlight.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="btnPrevHighlight.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -243,6 +223,26 @@
ICAgYzAuOS0zLDMuNy01LDctNXM2LjEsMiw3LDVDMjkuMSwyNiwyNi4zLDI4LDIzLDI4eiBNMjMsMjZj ICAgYzAuOS0zLDMuNy01LDctNXM2LjEsMiw3LDVDMjkuMSwyNiwyNi4zLDI4LDIzLDI4eiBNMjMsMjZj
LTEuNywwLTMtMS4zLTMtM3MxLjMtMywzLTNzMywxLjMsMywzUzI0LjcsMjYsMjMsMjZ6IiBjbGFzcz0i LTEuNywwLTMtMS4zLTMtM3MxLjMtMywzLTNzMywxLjMsMywzUzI0LjcsMjYsMjMsMjZ6IiBjbGFzcz0i
QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs= QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
</value>
</data>
<data name="btnSearch2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANoCAAAC77u/
PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9Ilpvb20iPg0KICAgIDxwYXRoIGQ9Ik0yNy43LDI1LjNM
MjAuNSwxOGMxLTEuNCwxLjUtMy4yLDEuNS01YzAtNS00LTktOS05cy05LDQtOSw5YzAsNSw0LDksOSw5
YzEuOSwwLDMuNi0wLjYsNS0xLjVsNy4zLDcuMyAgIGMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsMS4yLTEu
MkMyOC4xLDI2LjIsMjguMSwyNS42LDI3LjcsMjUuM3ogTTYsMTNjMC0zLjksMy4xLTcsNy03czcsMy4x
LDcsN2MwLDMuOS0zLjEsNy03LDdTNiwxNi45LDYsMTN6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4N
Cjwvc3ZnPgs=
</value> </value>
</data> </data>
<metadata name="PrintDocument1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="PrintDocument1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

12
Controls.DocumentViewer/DocumentViewer.vb
View File

@ -23,6 +23,7 @@ Public Class DocumentViewer
Private Enum ViewerMode Private Enum ViewerMode
GDPicture GDPicture
Excel Excel
Richtext
End Enum End Enum
Private Enum FileLoadMode Private Enum FileLoadMode
@ -124,7 +125,6 @@ Public Class DocumentViewer
''' </summary> ''' </summary>
Public Sub LoadFile(FilePath As String) Public Sub LoadFile(FilePath As String)
FileLoaded = False FileLoaded = False
If _licenseKey = String.Empty Then If _licenseKey = String.Empty Then
_logger.Warn("License key was not provided. File {0} not loaded.", FilePath) _logger.Warn("License key was not provided. File {0} not loaded.", FilePath)
Exit Sub Exit Sub
@ -139,7 +139,7 @@ Public Class DocumentViewer
_FileLoadMode = FileLoadMode.File _FileLoadMode = FileLoadMode.File
_FileInfo = New FileInfo(FilePath) _FileInfo = New FileInfo(FilePath)
_logger.Info("Loading File [{0}] from Filesystem", FilePath) _logger.Info("Loading file [{0}] from Filesystem", FilePath)
FileLoaded = DoLoadFile(FilePath) FileLoaded = DoLoadFile(FilePath)
SetViewerMode(_FileInfo.Extension) SetViewerMode(_FileInfo.Extension)
@ -441,6 +441,8 @@ Public Class DocumentViewer
Select Case Extension.ToUpper Select Case Extension.ToUpper
Case "CSV" Case "CSV"
_ViewerMode = ViewerMode.Excel _ViewerMode = ViewerMode.Excel
Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT"
_ViewerMode = ViewerMode.RichText
Case Else Case Else
_ViewerMode = ViewerMode.GDPicture _ViewerMode = ViewerMode.GDPicture
End Select End Select
@ -471,7 +473,9 @@ Public Class DocumentViewer
lbFileNotLoaded.Visible = False lbFileNotLoaded.Visible = False
SpreadsheetControl1.Visible = False SpreadsheetControl1.Visible = False
RichEditControl1.Visible = False
SpreadsheetControl1.Dock = DockStyle.None SpreadsheetControl1.Dock = DockStyle.None
RichEditControl1.Dock = DockStyle.None
Select Case oExtension.ToUpper Select Case oExtension.ToUpper
Case ".CSV" Case ".CSV"
@ -483,7 +487,11 @@ Public Class DocumentViewer
SpreadsheetControl1.Visible = True SpreadsheetControl1.Visible = True
SpreadsheetControl1.Dock = DockStyle.Fill SpreadsheetControl1.Dock = DockStyle.Fill
Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT"
RichEditControl1.LoadDocument(FilePath, GetDocumentFormat(oExtension))
RichEditControl1.Visible = True
RichEditControl1.Dock = DockStyle.Fill
Case Else Case Else
GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter

30
Controls.DocumentViewer/DocumentViewer.vbproj
View File

@ -78,21 +78,17 @@
<Reference Include="DevExpress.XtraRichEdit.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> <Reference Include="DevExpress.XtraRichEdit.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraSpreadsheet.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> <Reference Include="DevExpress.XtraSpreadsheet.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /> <Reference Include="DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DigitalData.Modules.Base, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DigitalData.Modules.Base">
<SpecificVersion>False</SpecificVersion> <HintPath>..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
<HintPath>..\..\Modules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Config, Version=1.1.4.1, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DigitalData.Modules.Config">
<SpecificVersion>False</SpecificVersion> <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
<HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DigitalData.Modules.Logging">
<SpecificVersion>False</SpecificVersion> <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
<HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Messaging, Version=1.7.3.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DigitalData.Modules.Messaging">
<SpecificVersion>False</SpecificVersion> <HintPath>..\..\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
<HintPath>..\..\Modules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
</Reference> </Reference>
<Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL"> <Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
<HintPath>..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath> <HintPath>..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
@ -164,9 +160,15 @@
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath> <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes> <EmbedInteropTypes>True</EmbedInteropTypes>
</Reference> </Reference>
<Reference Include="IndexRange, Version=1.0.3.0, Culture=neutral, PublicKeyToken=35e6a3c4212514c6, processorArchitecture=MSIL">
<HintPath>..\packages\IndexRange.1.0.3\lib\net45\IndexRange.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath> <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.Bcl.HashCode, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.HashCode.6.0.0\lib\net462\Microsoft.Bcl.HashCode.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath> <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
@ -177,8 +179,8 @@
<Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL"> <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath> <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
</Reference> </Reference>
<Reference Include="OpenMcdf, Version=2.4.1.0, Culture=neutral, PublicKeyToken=fdbb1629d7c00800, processorArchitecture=MSIL"> <Reference Include="OpenMcdf, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\OpenMcdf.2.4.1\lib\net40\OpenMcdf.dll</HintPath> <HintPath>..\packages\OpenMcdf.3.0.0\lib\netstandard2.0\OpenMcdf.dll</HintPath>
</Reference> </Reference>
<Reference Include="PresentationCore" /> <Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" /> <Reference Include="PresentationFramework" />

4
Controls.DocumentViewer/My Project/AssemblyInfo.vb
View File

@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.0.0.0")> <Assembly: AssemblyVersion("2.0.2.0")>
<Assembly: AssemblyFileVersion("2.0.0.0")> <Assembly: AssemblyFileVersion("2.0.1.0")>

4
Controls.DocumentViewer/packages.config
View File

@ -5,14 +5,16 @@
<package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net462" /> <package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net462" />
<package id="GdPicture" version="14.3.3" targetFramework="net462" /> <package id="GdPicture" version="14.3.3" targetFramework="net462" />
<package id="GdPicture.runtimes.windows" version="14.3.3" targetFramework="net462" /> <package id="GdPicture.runtimes.windows" version="14.3.3" targetFramework="net462" />
<package id="IndexRange" version="1.0.3" targetFramework="net462" />
<package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net462" /> <package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net462" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net462" /> <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net462" />
<package id="Microsoft.Bcl.HashCode" version="6.0.0" targetFramework="net462" />
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="net462" /> <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net462" />
<package id="Microsoft.VisualBasic" version="10.3.0" targetFramework="net462" /> <package id="Microsoft.VisualBasic" version="10.3.0" targetFramework="net462" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" /> <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
<package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net462" /> <package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net462" />
<package id="NLog" version="5.0.5" targetFramework="net461" /> <package id="NLog" version="5.0.5" targetFramework="net461" />
<package id="OpenMcdf" version="2.4.1" targetFramework="net462" /> <package id="OpenMcdf" version="3.0.0" targetFramework="net462" />
<package id="protobuf-net" version="3.2.46" targetFramework="net462" /> <package id="protobuf-net" version="3.2.46" targetFramework="net462" />
<package id="protobuf-net.Core" version="3.2.46" targetFramework="net462" /> <package id="protobuf-net.Core" version="3.2.46" targetFramework="net462" />
<package id="RtfPipe" version="2.0.7677.4303" targetFramework="net462" /> <package id="RtfPipe" version="2.0.7677.4303" targetFramework="net462" />

2
Controls.LookupGrid/My Project/AssemblyInfo.vb
View File

@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyCompany("Digital Data")> <Assembly: AssemblyCompany("Digital Data")>
<Assembly: AssemblyProduct("LookupGrid")> <Assembly: AssemblyProduct("LookupGrid")>
<Assembly: AssemblyCopyright("Copyright © 2024")> <Assembly: AssemblyCopyright("Copyright © 2024")>
<Assembly: AssemblyTrademark("3.4.0.0")> <Assembly: AssemblyTrademark("3.4.3.0")>
<Assembly: ComVisible(False)> <Assembly: ComVisible(False)>

1
Controls.LookupGrid/frmLookupGrid.Designer.vb generated
View File

@ -50,6 +50,7 @@ Partial Class frmLookupGrid
' '
Me.viewLookup.GridControl = Me.gridLookup Me.viewLookup.GridControl = Me.gridLookup
Me.viewLookup.Name = "viewLookup" Me.viewLookup.Name = "viewLookup"
Me.viewLookup.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
Me.viewLookup.OptionsView.ShowGroupPanel = False Me.viewLookup.OptionsView.ShowGroupPanel = False
' '
'Panel1 'Panel1

25
GUIs.Test.TestGUI/TestGUI.vbproj
View File

@ -85,33 +85,38 @@
<Reference Include="DigitalData.GUIs.Common"> <Reference Include="DigitalData.GUIs.Common">
<HintPath>..\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll</HintPath> <HintPath>..\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Base">
<HintPath>..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Config"> <Reference Include="DigitalData.Modules.Config">
<HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath> <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Database"> <Reference Include="DigitalData.Modules.Database">
<HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath> <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Encryption">
<HintPath>..\..\DDModules\Encryption\bin\Debug\DigitalData.Modules.Encryption.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Filesystem"> <Reference Include="DigitalData.Modules.Filesystem">
<HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Filesystem.dll</HintPath> <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Filesystem.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Interfaces"> <Reference Include="DigitalData.Modules.Interfaces">
<HintPath>..\..\Modules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath> <HintPath>..\..\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Jobs, Version=2.4.1.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DigitalData.Modules.Jobs">
<SpecificVersion>False</SpecificVersion> <HintPath>..\..\DDModules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll</HintPath>
<HintPath>..\..\Modules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Logging"> <Reference Include="DigitalData.Modules.Logging">
<HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath> <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Messaging"> <Reference Include="DigitalData.Modules.Messaging">
<HintPath>..\..\Modules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath> <HintPath>..\..\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Windows"> <Reference Include="DigitalData.Modules.Windows">
<HintPath>..\..\Modules\Windows\bin\Debug\DigitalData.Modules.Windows.dll</HintPath> <HintPath>..\..\DDModules\Windows\bin\Debug\DigitalData.Modules.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Windream"> <Reference Include="DigitalData.Modules.Windream">
<HintPath>..\..\Modules\Windream\bin\Debug\DigitalData.Modules.Windream.dll</HintPath> <HintPath>..\..\DDModules\Windream\bin\Debug\DigitalData.Modules.Windream.dll</HintPath>
</Reference> </Reference>
<Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL"> <Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
<HintPath>..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath> <HintPath>..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>

31
GUIs.Test.TestGUI/frmDocView.Designer.vb generated
View File

@ -1,9 +1,9 @@
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _ <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
Partial Class frmDocView Partial Class frmDocView
Inherits System.Windows.Forms.Form Inherits System.Windows.Forms.Form
'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
<System.Diagnostics.DebuggerNonUserCode()> _ <System.Diagnostics.DebuggerNonUserCode()>
Protected Overrides Sub Dispose(ByVal disposing As Boolean) Protected Overrides Sub Dispose(ByVal disposing As Boolean)
Try Try
If disposing AndAlso components IsNot Nothing Then If disposing AndAlso components IsNot Nothing Then
@ -20,7 +20,7 @@ Partial Class frmDocView
'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
'Das Bearbeiten ist mit dem Windows Form-Designer möglich. 'Das Bearbeiten ist mit dem Windows Form-Designer möglich.
'Das Bearbeiten mit dem Code-Editor ist nicht möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()> _ <System.Diagnostics.DebuggerStepThrough()>
Private Sub InitializeComponent() Private Sub InitializeComponent()
Me.Panel1 = New System.Windows.Forms.Panel() Me.Panel1 = New System.Windows.Forms.Panel()
Me.Button2 = New System.Windows.Forms.Button() Me.Button2 = New System.Windows.Forms.Button()
@ -28,7 +28,7 @@ Partial Class frmDocView
Me.Button4 = New System.Windows.Forms.Button() Me.Button4 = New System.Windows.Forms.Button()
Me.Button3 = New System.Windows.Forms.Button() Me.Button3 = New System.Windows.Forms.Button()
Me.Button1 = New System.Windows.Forms.Button() Me.Button1 = New System.Windows.Forms.Button()
Me.TextBox1 = New System.Windows.Forms.TextBox() Me.txtfilepath = New System.Windows.Forms.TextBox()
Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog() Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
Me.MyDocumentViewer = New DigitalData.Controls.DocumentViewer.DocumentViewer() Me.MyDocumentViewer = New DigitalData.Controls.DocumentViewer.DocumentViewer()
Me.Panel1.SuspendLayout() Me.Panel1.SuspendLayout()
@ -41,7 +41,7 @@ Partial Class frmDocView
Me.Panel1.Controls.Add(Me.Button4) Me.Panel1.Controls.Add(Me.Button4)
Me.Panel1.Controls.Add(Me.Button3) Me.Panel1.Controls.Add(Me.Button3)
Me.Panel1.Controls.Add(Me.Button1) Me.Panel1.Controls.Add(Me.Button1)
Me.Panel1.Controls.Add(Me.TextBox1) Me.Panel1.Controls.Add(Me.txtfilepath)
Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top
Me.Panel1.Location = New System.Drawing.Point(0, 0) Me.Panel1.Location = New System.Drawing.Point(0, 0)
Me.Panel1.Name = "Panel1" Me.Panel1.Name = "Panel1"
@ -93,25 +93,25 @@ Partial Class frmDocView
Me.Button1.Text = "Open File" Me.Button1.Text = "Open File"
Me.Button1.UseVisualStyleBackColor = True Me.Button1.UseVisualStyleBackColor = True
' '
'TextBox1 'txtfilepath
' '
Me.TextBox1.Location = New System.Drawing.Point(12, 12) Me.txtfilepath.Location = New System.Drawing.Point(12, 12)
Me.TextBox1.Name = "TextBox1" Me.txtfilepath.Name = "txtfilepath"
Me.TextBox1.Size = New System.Drawing.Size(524, 20) Me.txtfilepath.Size = New System.Drawing.Size(524, 20)
Me.TextBox1.TabIndex = 0 Me.txtfilepath.TabIndex = 0
' '
'OpenFileDialog1 'OpenFileDialog1
' '
Me.OpenFileDialog1.FileName = "OpenFileDialog1" Me.OpenFileDialog1.FileName = "OpenFileDialog1"
' '
'DocumentViewer1 'MyDocumentViewer
' '
Me.MyDocumentViewer.Dock = System.Windows.Forms.DockStyle.Fill Me.MyDocumentViewer.Dock = System.Windows.Forms.DockStyle.Fill
Me.MyDocumentViewer.FileLoaded = False Me.MyDocumentViewer.FileLoaded = False
Me.MyDocumentViewer.Location = New System.Drawing.Point(0, 43) Me.MyDocumentViewer.Location = New System.Drawing.Point(0, 43)
Me.MyDocumentViewer.Name = "DocumentViewer1" Me.MyDocumentViewer.Name = "MyDocumentViewer"
Me.MyDocumentViewer.Size = New System.Drawing.Size(1079, 463) Me.MyDocumentViewer.Size = New System.Drawing.Size(1079, 463)
Me.MyDocumentViewer.TabIndex = 0 Me.MyDocumentViewer.TabIndex = 2
' '
'frmDocView 'frmDocView
' '
@ -127,14 +127,13 @@ Partial Class frmDocView
Me.ResumeLayout(False) Me.ResumeLayout(False)
End Sub End Sub
Friend WithEvents MyDocumentViewer As DigitalData.Controls.DocumentViewer.DocumentViewer
Friend WithEvents Panel1 As Panel Friend WithEvents Panel1 As Panel
Friend WithEvents Button1 As Button Friend WithEvents Button1 As Button
Friend WithEvents TextBox1 As TextBox Friend WithEvents txtfilepath As TextBox
Friend WithEvents OpenFileDialog1 As OpenFileDialog Friend WithEvents OpenFileDialog1 As OpenFileDialog
Friend WithEvents Button2 As Button Friend WithEvents Button2 As Button
Friend WithEvents Button3 As Button Friend WithEvents Button3 As Button
Friend WithEvents Button4 As Button Friend WithEvents Button4 As Button
Friend WithEvents Button5 As Button Friend WithEvents Button5 As Button
Friend WithEvents MyDocumentViewer As DigitalData.Controls.DocumentViewer.DocumentViewer
End Class End Class

11
GUIs.Test.TestGUI/frmDocView.vb
View File

@ -8,13 +8,13 @@ Public Class frmDocView
Private Const GDPICTURE_KEY = "kG1Qf9PwmqgR8aDmIW2zI_ebj48RzqAJegRxcystEmkbTGQqfkNBdFOXIb6C_A00Ra8zZkrHdfjqzOPXK7kgkF2YDhvrqKfqh4WDug2vOt0qO31IommzkANSuLjZ4zmraoubyEVd25rE3veQ2h_j7tGIoH_LyIHmy24GaXsxdG0yCzIBMdiLbMMMDwcPY-809KeZ83Grv76OVhFvcbBWyYc251vou1N-kGg5_ZlHDgfWoY85gTLRxafjD3KS_i9ARW4BMiy36y8n7UP2jN8kGRnW_04ubpFtfjJqvtsrP_J9D0x7bqV8xtVtT5JI6dpKsVTiMgDCrIcoFSo5gCC1fw9oUopX4TDCkBQttO4-WHBlOeq9dG5Yb0otonVmJKaQA2tP6sMR-lZDs3ql_WI9t91yPWgpssrJUxSHDd27_LMTH_owJIqkF3NOJd9mYQuAv22oNKFYbH8e41pVKb8cT33Y9CgcQ_sy6YDA5PTuIRi67mjKge_nD9rd0IN213Ir9M_EFWqg9e4haWzIdHXQUo0md70kVhPX4UIH_BKJnxEEnFfoFRNMh77bB0N4jkcBEHPl-ghOERv8dOztf4vCnNpzzWvcLD2cqWIm6THy8XGGq9h4hp8aEreRleSMwv9QQAC7mjLwhQ1rBYkpUHlpTjhTLnMwHknl6HH0Z6zzmsgkRKVyfquv94Pd7QbQfZrRka0ss_48pf9p8hAywEn81Q==" Private Const GDPICTURE_KEY = "kG1Qf9PwmqgR8aDmIW2zI_ebj48RzqAJegRxcystEmkbTGQqfkNBdFOXIb6C_A00Ra8zZkrHdfjqzOPXK7kgkF2YDhvrqKfqh4WDug2vOt0qO31IommzkANSuLjZ4zmraoubyEVd25rE3veQ2h_j7tGIoH_LyIHmy24GaXsxdG0yCzIBMdiLbMMMDwcPY-809KeZ83Grv76OVhFvcbBWyYc251vou1N-kGg5_ZlHDgfWoY85gTLRxafjD3KS_i9ARW4BMiy36y8n7UP2jN8kGRnW_04ubpFtfjJqvtsrP_J9D0x7bqV8xtVtT5JI6dpKsVTiMgDCrIcoFSo5gCC1fw9oUopX4TDCkBQttO4-WHBlOeq9dG5Yb0otonVmJKaQA2tP6sMR-lZDs3ql_WI9t91yPWgpssrJUxSHDd27_LMTH_owJIqkF3NOJd9mYQuAv22oNKFYbH8e41pVKb8cT33Y9CgcQ_sy6YDA5PTuIRi67mjKge_nD9rd0IN213Ir9M_EFWqg9e4haWzIdHXQUo0md70kVhPX4UIH_BKJnxEEnFfoFRNMh77bB0N4jkcBEHPl-ghOERv8dOztf4vCnNpzzWvcLD2cqWIm6THy8XGGq9h4hp8aEreRleSMwv9QQAC7mjLwhQ1rBYkpUHlpTjhTLnMwHknl6HH0Z6zzmsgkRKVyfquv94Pd7QbQfZrRka0ss_48pf9p8hAywEn81Q=="
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
If String.IsNullOrEmpty(TextBox1.Text) Then If String.IsNullOrEmpty(txtfilepath.Text) Then
If OpenFileDialog1.ShowDialog() = DialogResult.OK Then If OpenFileDialog1.ShowDialog() = DialogResult.OK Then
TextBox1.Text = OpenFileDialog1.FileName txtfilepath.Text = OpenFileDialog1.FileName
MyDocumentViewer.LoadFile(TextBox1.Text) MyDocumentViewer.LoadFile(txtfilepath.Text)
End If End If
Else Else
MyDocumentViewer.LoadFile(TextBox1.Text) MyDocumentViewer.LoadFile(txtfilepath.Text)
End If End If
End Sub End Sub
@ -30,6 +30,7 @@ Public Class frmDocView
Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
MyDocumentViewer.Done() MyDocumentViewer.Done()
txtfilepath.Text = ""
End Sub End Sub
Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
@ -46,7 +47,7 @@ Public Class frmDocView
licenseManager.RegisterKEY(GDPICTURE_KEY) licenseManager.RegisterKEY(GDPICTURE_KEY)
Dim oPDFConverter = New PDFConverter(LogConfig) Dim oPDFConverter = New PDFConverter(LogConfig)
Dim oResult = oPDFConverter.ConvertPDFADocumentToPDFDocument(TextBox1.Text, TextBox1.Text & ".cloned.pdf") Dim oResult = oPDFConverter.ConvertPDFADocumentToPDFDocument(txtfilepath.Text, txtfilepath.Text & ".cloned.pdf")
If oResult = True Then If oResult = True Then
MsgBox("Document was successfully cloned!") MsgBox("Document was successfully cloned!")

144
GUIs.Test.ZUGFeRDTest/Form1.Designer.vb generated
View File

@ -25,21 +25,21 @@ Partial Class Form1
Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog() Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
Me.btRunJob = New System.Windows.Forms.Button() Me.btRunJob = New System.Windows.Forms.Button()
Me.ListBox1 = New System.Windows.Forms.ListBox() Me.ListBox1 = New System.Windows.Forms.ListBox()
Me.Button2 = New System.Windows.Forms.Button() Me.btValidateSerializePDF = New System.Windows.Forms.Button()
Me.Button3 = New System.Windows.Forms.Button() Me.btValidateSerializeParseProps = New System.Windows.Forms.Button()
Me.Button4 = New System.Windows.Forms.Button() Me.btCreateMD5Checksum = New System.Windows.Forms.Button()
Me.GroupBox1 = New System.Windows.Forms.GroupBox() Me.GroupBox1 = New System.Windows.Forms.GroupBox()
Me.GroupBox2 = New System.Windows.Forms.GroupBox()
Me.ButtonValidateXMLOnly = New System.Windows.Forms.Button() Me.ButtonValidateXMLOnly = New System.Windows.Forms.Button()
Me.Button7 = New System.Windows.Forms.Button() Me.GroupBox2 = New System.Windows.Forms.GroupBox()
Me.btExtractPDFAttachments = New System.Windows.Forms.Button()
Me.GroupBox3 = New System.Windows.Forms.GroupBox() Me.GroupBox3 = New System.Windows.Forms.GroupBox()
Me.txtMD5Checksum = New System.Windows.Forms.TextBox() Me.txtMD5Checksum = New System.Windows.Forms.TextBox()
Me.txtPropName = New System.Windows.Forms.TextBox() Me.txtPropName = New System.Windows.Forms.TextBox()
Me.GroupBox4 = New System.Windows.Forms.GroupBox() Me.GroupBox4 = New System.Windows.Forms.GroupBox()
Me.Button6 = New System.Windows.Forms.Button() Me.btFindExtractXMLValue = New System.Windows.Forms.Button()
Me.FolderBrowserDialog1 = New System.Windows.Forms.FolderBrowserDialog() Me.FolderBrowserDialog1 = New System.Windows.Forms.FolderBrowserDialog()
Me.GroupBox5 = New System.Windows.Forms.GroupBox() Me.GroupBox5 = New System.Windows.Forms.GroupBox()
Me.Button5 = New System.Windows.Forms.Button() Me.btWriteBinary = New System.Windows.Forms.Button()
Me.OpenFileDialog2 = New System.Windows.Forms.OpenFileDialog() Me.OpenFileDialog2 = New System.Windows.Forms.OpenFileDialog()
Me.GroupBox1.SuspendLayout() Me.GroupBox1.SuspendLayout()
Me.GroupBox2.SuspendLayout() Me.GroupBox2.SuspendLayout()
@ -72,32 +72,32 @@ Partial Class Form1
Me.ListBox1.Size = New System.Drawing.Size(532, 602) Me.ListBox1.Size = New System.Drawing.Size(532, 602)
Me.ListBox1.TabIndex = 1 Me.ListBox1.TabIndex = 1
' '
'Button2 'btValidateSerializePDF
' '
Me.Button2.Location = New System.Drawing.Point(6, 19) Me.btValidateSerializePDF.Location = New System.Drawing.Point(6, 19)
Me.Button2.Name = "Button2" Me.btValidateSerializePDF.Name = "btValidateSerializePDF"
Me.Button2.Size = New System.Drawing.Size(246, 23) Me.btValidateSerializePDF.Size = New System.Drawing.Size(246, 23)
Me.Button2.TabIndex = 2 Me.btValidateSerializePDF.TabIndex = 2
Me.Button2.Text = "Validate and Serialize PDF" Me.btValidateSerializePDF.Text = "Validate and Serialize PDF"
Me.Button2.UseVisualStyleBackColor = True Me.btValidateSerializePDF.UseVisualStyleBackColor = True
' '
'Button3 'btValidateSerializeParseProps
' '
Me.Button3.Location = New System.Drawing.Point(6, 48) Me.btValidateSerializeParseProps.Location = New System.Drawing.Point(6, 48)
Me.Button3.Name = "Button3" Me.btValidateSerializeParseProps.Name = "btValidateSerializeParseProps"
Me.Button3.Size = New System.Drawing.Size(246, 23) Me.btValidateSerializeParseProps.Size = New System.Drawing.Size(246, 23)
Me.Button3.TabIndex = 3 Me.btValidateSerializeParseProps.TabIndex = 3
Me.Button3.Text = "Validate and Serialize PDF and Parse Props" Me.btValidateSerializeParseProps.Text = "Validate and Serialize PDF and Parse Props"
Me.Button3.UseVisualStyleBackColor = True Me.btValidateSerializeParseProps.UseVisualStyleBackColor = True
' '
'Button4 'btCreateMD5Checksum
' '
Me.Button4.Location = New System.Drawing.Point(6, 19) Me.btCreateMD5Checksum.Location = New System.Drawing.Point(6, 19)
Me.Button4.Name = "Button4" Me.btCreateMD5Checksum.Name = "btCreateMD5Checksum"
Me.Button4.Size = New System.Drawing.Size(221, 23) Me.btCreateMD5Checksum.Size = New System.Drawing.Size(221, 23)
Me.Button4.TabIndex = 4 Me.btCreateMD5Checksum.TabIndex = 4
Me.Button4.Text = "Create MD5 Checksum for PDF" Me.btCreateMD5Checksum.Text = "Create MD5 Checksum for PDF"
Me.Button4.UseVisualStyleBackColor = True Me.btCreateMD5Checksum.UseVisualStyleBackColor = True
' '
'GroupBox1 'GroupBox1
' '
@ -108,19 +108,7 @@ Partial Class Form1
Me.GroupBox1.Size = New System.Drawing.Size(360, 92) Me.GroupBox1.Size = New System.Drawing.Size(360, 92)
Me.GroupBox1.TabIndex = 7 Me.GroupBox1.TabIndex = 7
Me.GroupBox1.TabStop = False Me.GroupBox1.TabStop = False
Me.GroupBox1.Text = "Run Job like in ZUGFeRD Service" Me.GroupBox1.Text = "Run Job like in eInvoice Service"
'
'GroupBox2
'
Me.GroupBox2.Controls.Add(Me.Button2)
Me.GroupBox2.Controls.Add(Me.Button7)
Me.GroupBox2.Controls.Add(Me.Button3)
Me.GroupBox2.Location = New System.Drawing.Point(12, 110)
Me.GroupBox2.Name = "GroupBox2"
Me.GroupBox2.Size = New System.Drawing.Size(360, 155)
Me.GroupBox2.TabIndex = 8
Me.GroupBox2.TabStop = False
Me.GroupBox2.Text = "Run Functions on a single file (needs Breakpoint)"
' '
'ButtonValidateXMLOnly 'ButtonValidateXMLOnly
' '
@ -131,18 +119,30 @@ Partial Class Form1
Me.ButtonValidateXMLOnly.Text = "Run XML Job (spez. Configuration)" Me.ButtonValidateXMLOnly.Text = "Run XML Job (spez. Configuration)"
Me.ButtonValidateXMLOnly.UseVisualStyleBackColor = True Me.ButtonValidateXMLOnly.UseVisualStyleBackColor = True
' '
'Button7 'GroupBox2
' '
Me.Button7.Location = New System.Drawing.Point(6, 77) Me.GroupBox2.Controls.Add(Me.btValidateSerializePDF)
Me.Button7.Name = "Button7" Me.GroupBox2.Controls.Add(Me.btExtractPDFAttachments)
Me.Button7.Size = New System.Drawing.Size(246, 23) Me.GroupBox2.Controls.Add(Me.btValidateSerializeParseProps)
Me.Button7.TabIndex = 3 Me.GroupBox2.Location = New System.Drawing.Point(12, 110)
Me.Button7.Text = "Extract PDF Attachments" Me.GroupBox2.Name = "GroupBox2"
Me.Button7.UseVisualStyleBackColor = True Me.GroupBox2.Size = New System.Drawing.Size(360, 155)
Me.GroupBox2.TabIndex = 8
Me.GroupBox2.TabStop = False
Me.GroupBox2.Text = "Run Functions on a single file (needs Breakpoint)"
'
'btExtractPDFAttachments
'
Me.btExtractPDFAttachments.Location = New System.Drawing.Point(6, 77)
Me.btExtractPDFAttachments.Name = "btExtractPDFAttachments"
Me.btExtractPDFAttachments.Size = New System.Drawing.Size(246, 23)
Me.btExtractPDFAttachments.TabIndex = 3
Me.btExtractPDFAttachments.Text = "Extract PDF Attachments"
Me.btExtractPDFAttachments.UseVisualStyleBackColor = True
' '
'GroupBox3 'GroupBox3
' '
Me.GroupBox3.Controls.Add(Me.Button4) Me.GroupBox3.Controls.Add(Me.btCreateMD5Checksum)
Me.GroupBox3.Controls.Add(Me.txtMD5Checksum) Me.GroupBox3.Controls.Add(Me.txtMD5Checksum)
Me.GroupBox3.Location = New System.Drawing.Point(12, 271) Me.GroupBox3.Location = New System.Drawing.Point(12, 271)
Me.GroupBox3.Name = "GroupBox3" Me.GroupBox3.Name = "GroupBox3"
@ -169,7 +169,7 @@ Partial Class Form1
' '
'GroupBox4 'GroupBox4
' '
Me.GroupBox4.Controls.Add(Me.Button6) Me.GroupBox4.Controls.Add(Me.btFindExtractXMLValue)
Me.GroupBox4.Controls.Add(Me.txtPropName) Me.GroupBox4.Controls.Add(Me.txtPropName)
Me.GroupBox4.Location = New System.Drawing.Point(12, 362) Me.GroupBox4.Location = New System.Drawing.Point(12, 362)
Me.GroupBox4.Name = "GroupBox4" Me.GroupBox4.Name = "GroupBox4"
@ -178,18 +178,18 @@ Partial Class Form1
Me.GroupBox4.TabStop = False Me.GroupBox4.TabStop = False
Me.GroupBox4.Text = "GroupBox4" Me.GroupBox4.Text = "GroupBox4"
' '
'Button6 'btFindExtractXMLValue
' '
Me.Button6.Location = New System.Drawing.Point(6, 19) Me.btFindExtractXMLValue.Location = New System.Drawing.Point(6, 19)
Me.Button6.Name = "Button6" Me.btFindExtractXMLValue.Name = "btFindExtractXMLValue"
Me.Button6.Size = New System.Drawing.Size(221, 23) Me.btFindExtractXMLValue.Size = New System.Drawing.Size(221, 23)
Me.Button6.TabIndex = 11 Me.btFindExtractXMLValue.TabIndex = 11
Me.Button6.Text = "Find and Extract XML Path Value" Me.btFindExtractXMLValue.Text = "Find and Extract XML Path Value"
Me.Button6.UseVisualStyleBackColor = True Me.btFindExtractXMLValue.UseVisualStyleBackColor = True
' '
'GroupBox5 'GroupBox5
' '
Me.GroupBox5.Controls.Add(Me.Button5) Me.GroupBox5.Controls.Add(Me.btWriteBinary)
Me.GroupBox5.Location = New System.Drawing.Point(12, 490) Me.GroupBox5.Location = New System.Drawing.Point(12, 490)
Me.GroupBox5.Name = "GroupBox5" Me.GroupBox5.Name = "GroupBox5"
Me.GroupBox5.Size = New System.Drawing.Size(360, 122) Me.GroupBox5.Size = New System.Drawing.Size(360, 122)
@ -197,14 +197,14 @@ Partial Class Form1
Me.GroupBox5.TabStop = False Me.GroupBox5.TabStop = False
Me.GroupBox5.Text = "GroupBox5" Me.GroupBox5.Text = "GroupBox5"
' '
'Button5 'btWriteBinary
' '
Me.Button5.Location = New System.Drawing.Point(6, 19) Me.btWriteBinary.Location = New System.Drawing.Point(6, 19)
Me.Button5.Name = "Button5" Me.btWriteBinary.Name = "btWriteBinary"
Me.Button5.Size = New System.Drawing.Size(221, 23) Me.btWriteBinary.Size = New System.Drawing.Size(221, 23)
Me.Button5.TabIndex = 11 Me.btWriteBinary.TabIndex = 11
Me.Button5.Text = "Write Binary to PDF" Me.btWriteBinary.Text = "Write Binary to PDF"
Me.Button5.UseVisualStyleBackColor = True Me.btWriteBinary.UseVisualStyleBackColor = True
' '
'OpenFileDialog2 'OpenFileDialog2
' '
@ -223,7 +223,7 @@ Partial Class Form1
Me.Controls.Add(Me.GroupBox1) Me.Controls.Add(Me.GroupBox1)
Me.Controls.Add(Me.ListBox1) Me.Controls.Add(Me.ListBox1)
Me.Name = "Form1" Me.Name = "Form1"
Me.Text = "Form1" Me.Text = "E-Invoice-TEST-Tool"
Me.GroupBox1.ResumeLayout(False) Me.GroupBox1.ResumeLayout(False)
Me.GroupBox2.ResumeLayout(False) Me.GroupBox2.ResumeLayout(False)
Me.GroupBox3.ResumeLayout(False) Me.GroupBox3.ResumeLayout(False)
@ -238,20 +238,20 @@ Partial Class Form1
Friend WithEvents OpenFileDialog1 As OpenFileDialog Friend WithEvents OpenFileDialog1 As OpenFileDialog
Friend WithEvents btRunJob As Button Friend WithEvents btRunJob As Button
Friend WithEvents ListBox1 As ListBox Friend WithEvents ListBox1 As ListBox
Friend WithEvents Button2 As Button Friend WithEvents btValidateSerializePDF As Button
Friend WithEvents Button3 As Button Friend WithEvents btValidateSerializeParseProps As Button
Friend WithEvents Button4 As Button Friend WithEvents btCreateMD5Checksum As Button
Friend WithEvents txtMD5Checksum As TextBox Friend WithEvents txtMD5Checksum As TextBox
Friend WithEvents GroupBox1 As GroupBox Friend WithEvents GroupBox1 As GroupBox
Friend WithEvents GroupBox2 As GroupBox Friend WithEvents GroupBox2 As GroupBox
Friend WithEvents GroupBox3 As GroupBox Friend WithEvents GroupBox3 As GroupBox
Friend WithEvents txtPropName As TextBox Friend WithEvents txtPropName As TextBox
Friend WithEvents GroupBox4 As GroupBox Friend WithEvents GroupBox4 As GroupBox
Friend WithEvents Button6 As Button Friend WithEvents btFindExtractXMLValue As Button
Friend WithEvents Button7 As Button Friend WithEvents btExtractPDFAttachments As Button
Friend WithEvents FolderBrowserDialog1 As FolderBrowserDialog Friend WithEvents FolderBrowserDialog1 As FolderBrowserDialog
Friend WithEvents GroupBox5 As GroupBox Friend WithEvents GroupBox5 As GroupBox
Friend WithEvents Button5 As Button Friend WithEvents btWriteBinary As Button
Friend WithEvents ButtonValidateXMLOnly As Button Friend WithEvents ButtonValidateXMLOnly As Button
Friend WithEvents OpenFileDialog2 As OpenFileDialog Friend WithEvents OpenFileDialog2 As OpenFileDialog
End Class End Class

77
GUIs.Test.ZUGFeRDTest/Form1.vb
View File

File diff suppressed because one or more lines are too long

12
GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj
View File

@ -50,9 +50,6 @@
<OptionInfer>On</OptionInfer> <OptionInfer>On</OptionInfer>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
<HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Config"> <Reference Include="DigitalData.Modules.Config">
<HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath> <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
</Reference> </Reference>
@ -74,9 +71,6 @@
<Reference Include="DocumentFormat.OpenXml.Framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL"> <Reference Include="DocumentFormat.OpenXml.Framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
<HintPath>..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll</HintPath> <HintPath>..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll</HintPath>
</Reference> </Reference>
<Reference Include="GdPicture.NET.14, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.barcode.1d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL"> <Reference Include="GdPicture.NET.14.barcode.1d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll</HintPath> <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll</HintPath>
</Reference> </Reference>
@ -138,9 +132,9 @@
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath> <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes> <EmbedInteropTypes>True</EmbedInteropTypes>
</Reference> </Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> <Reference Include="GdPicture.NET.14, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath> <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath> <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>

14
Service.EDMIService/EDMIService.vbproj
View File

@ -67,16 +67,16 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="DigitalData.Modules.Base"> <Reference Include="DigitalData.Modules.Base">
<HintPath>..\..\Modules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath> <HintPath>..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Config"> <Reference Include="DigitalData.Modules.Config">
<HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath> <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Database"> <Reference Include="DigitalData.Modules.Database">
<HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath> <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.EDMI.API"> <Reference Include="DigitalData.Modules.EDMI.API">
<HintPath>..\..\Modules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath> <HintPath>..\..\DDModules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Filesystem"> <Reference Include="DigitalData.Modules.Filesystem">
<HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Filesystem.dll</HintPath> <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Filesystem.dll</HintPath>
@ -85,13 +85,13 @@
<HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Language.dll</HintPath> <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Language.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Logging"> <Reference Include="DigitalData.Modules.Logging">
<HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath> <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Patterns"> <Reference Include="DigitalData.Modules.Patterns">
<HintPath>..\..\Modules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll</HintPath> <HintPath>..\..\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.ZooFlow"> <Reference Include="DigitalData.Modules.ZooFlow">
<HintPath>..\..\Modules\Patterns\bin\Debug\DigitalData.Modules.ZooFlow.dll</HintPath> <HintPath>..\..\DDModules\ZooFlow\bin\Debug\DigitalData.Modules.ZooFlow.dll</HintPath>
</Reference> </Reference>
<Reference Include="FirebirdSql.Data.FirebirdClient, Version=7.5.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL"> <Reference Include="FirebirdSql.Data.FirebirdClient, Version=7.5.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
<HintPath>..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath> <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>

24
Services.EmailService/DDEmailService.vbproj
View File

@ -49,26 +49,22 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="DigitalData.Modules.Base"> <Reference Include="DigitalData.Modules.Base">
<HintPath>..\..\Modules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath> <HintPath>..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Config"> <Reference Include="DigitalData.Modules.Config">
<HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath> <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Database, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DigitalData.Modules.Database">
<SpecificVersion>False</SpecificVersion> <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
<HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Encryption, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DigitalData.Modules.Encryption">
<SpecificVersion>False</SpecificVersion> <HintPath>..\..\DDModules\Encryption\bin\Debug\DigitalData.Modules.Encryption.dll</HintPath>
<HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Encryption.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DigitalData.Modules.Logging">
<SpecificVersion>False</SpecificVersion> <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
<HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Messaging, Version=1.7.3.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DigitalData.Modules.Messaging">
<SpecificVersion>False</SpecificVersion> <HintPath>..\..\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
<HintPath>..\..\Modules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
</Reference> </Reference>
<Reference Include="FirebirdSql.Data.FirebirdClient, Version=7.5.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL"> <Reference Include="FirebirdSql.Data.FirebirdClient, Version=7.5.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
<HintPath>..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath> <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>

29
Services.EmailService/EmailService.vb
View File

@ -119,6 +119,7 @@ Public Class EmailService
If _AnyDatabaseInitialized Then If _AnyDatabaseInitialized Then
_Logger.Info("Starting Initial Run...") _Logger.Info("Starting Initial Run...")
_ConfigManager.Save()
_EmailQueue.RunWorkerAsync() _EmailQueue.RunWorkerAsync()
End If End If
Catch ex As Exception Catch ex As Exception
@ -275,10 +276,10 @@ Public Class EmailService
End Try End Try
End Function End Function
Private Function SendEmailFrom(Database As DatabaseType, MSSQLInstance As MSSQLServer) Private Function SendEmailFrom(pDatabase As DatabaseType, pMSSQLInstance As MSSQLServer)
Try Try
Dim oSQL As String = String.Empty Dim oSQL As String = String.Empty
Dim oEmailAccounts As List(Of EmailAccount) = GetAccounts(Database, MSSQLInstance) Dim oEmailAccounts As List(Of EmailAccount) = GetAccounts(pDatabase, pMSSQLInstance)
Dim oEmailQueue As DataTable = Nothing Dim oEmailQueue As DataTable = Nothing
If IsNothing(oEmailAccounts) Then If IsNothing(oEmailAccounts) Then
@ -291,7 +292,7 @@ Public Class EmailService
Return False Return False
End If End If
Select Case Database Select Case pDatabase
Case DatabaseType.Firebird Case DatabaseType.Firebird
oSQL = "SELECT * FROM TBEDM_EMAIL_QUEUE WHERE EMAIL_SENT IS NULL and EMAIL_TO <> ''" oSQL = "SELECT * FROM TBEDM_EMAIL_QUEUE WHERE EMAIL_SENT IS NULL and EMAIL_TO <> ''"
oEmailQueue = _Firebird.GetDatatable(oSQL) oEmailQueue = _Firebird.GetDatatable(oSQL)
@ -300,10 +301,10 @@ Public Class EmailService
_Logger.Debug("My.Settings.MSSQL_SELECT will be used..") _Logger.Debug("My.Settings.MSSQL_SELECT will be used..")
oSQL = My.Settings.MSSQL_SELECT oSQL = My.Settings.MSSQL_SELECT
Else Else
oSQL = "SELECT * FROM TBEMLP_EMAIL_OUT WHERE EMAIL_SENT IS NULL and EMAIL_ADRESS <> ''" oSQL = "SELECT * FROM TBEMLP_EMAIL_OUT WHERE EMAIL_SENT IS NULL and EMAIL_ADRESS <> '' ORDER BY GUID"
End If End If
oEmailQueue = MSSQLInstance.GetDatatable(oSQL) oEmailQueue = pMSSQLInstance.GetDatatable(oSQL)
End Select End Select
If IsNothing(oEmailQueue) Then If IsNothing(oEmailQueue) Then
@ -326,7 +327,7 @@ Public Class EmailService
Dim oAccountQueue As DataRow() Dim oAccountQueue As DataRow()
Select Case Database Select Case pDatabase
Case DatabaseType.Firebird Case DatabaseType.Firebird
oAccountQueue = oEmailQueue.Select($"EMAIL_ACCOUNT_ID = {oAccount.Guid}", "GUID ASC") oAccountQueue = oEmailQueue.Select($"EMAIL_ACCOUNT_ID = {oAccount.Guid}", "GUID ASC")
Case Else Case Else
@ -339,7 +340,7 @@ Public Class EmailService
Continue For Continue For
End If End If
_Logger.Debug("Preparing to send [{0}] mails..", oAccountQueue.Count) _Logger.Info("Preparing to send [{0}] mails for Email-Account [{1}]", oAccountQueue.Count, oAccount.Guid)
' ======= Initialize Sender ======= ' ======= Initialize Sender =======
@ -356,7 +357,7 @@ Public Class EmailService
Dim oResult As Mail.MailSession.SessionInfo = _MailSender.Connect(oAccount.Server, oAccount.Port, oAccount.Username, oAccount.Password, oAccount.AuthType, oOptions) Dim oResult As Mail.MailSession.SessionInfo = _MailSender.Connect(oAccount.Server, oAccount.Port, oAccount.Username, oAccount.Password, oAccount.AuthType, oOptions)
If oResult.Connected = False Then If oResult.Connected = False Then
_Logger.Warn("Could not connect to server. Skipping.") _Logger.Warn("Could not connect to server! (Method: Mail.MailSession.SessionInfo) # Skipping...")
Continue For Continue For
End If End If
@ -379,7 +380,7 @@ Public Class EmailService
Dim ATT1_RELATED_ID = String.Empty Dim ATT1_RELATED_ID = String.Empty
Dim ATT1_REL_TYPE = String.Empty Dim ATT1_REL_TYPE = String.Empty
Select Case Database Select Case pDatabase
Case DatabaseType.Firebird Case DatabaseType.Firebird
oGuid = oRow.Item("GUID") oGuid = oRow.Item("GUID")
@ -421,7 +422,7 @@ Public Class EmailService
If ATT1_RELATED_ID <> String.Empty And ATT1_REL_TYPE <> String.Empty Then If ATT1_RELATED_ID <> String.Empty And ATT1_REL_TYPE <> String.Empty Then
_Logger.Info($"Attachment via byte/ID [{ATT1_RELATED_ID}]...") _Logger.Info($"Attachment via byte/ID [{ATT1_RELATED_ID}]...")
If ATT1_REL_TYPE = "EnvelopeResult" Then If ATT1_REL_TYPE = "EnvelopeResult" Then
GetEnvelope_Result_FileStreamByte(ATT1_RELATED_ID, MSSQLInstance) GetEnvelope_Result_FileStreamByte(ATT1_RELATED_ID, pMSSQLInstance)
End If End If
If IsNothing(_AttachmentByteData) = False Then If IsNothing(_AttachmentByteData) = False Then
Dim oTempFolder = _TempFiles.TempPath Dim oTempFolder = _TempFiles.TempPath
@ -455,13 +456,13 @@ Public Class EmailService
oTotalSent.Add(oEmailTo) oTotalSent.Add(oEmailTo)
oSuccessfulSent.Add(oEmailTo) oSuccessfulSent.Add(oEmailTo)
Select Case Database Select Case pDatabase
Case DatabaseType.Firebird Case DatabaseType.Firebird
oSQL = GetFirebirdUpdateString(oComment, oGuid) oSQL = GetFirebirdUpdateString(oComment, oGuid)
_Firebird.ExecuteNonQuery(oSQL) _Firebird.ExecuteNonQuery(oSQL)
Case DatabaseType.MSSQL Case DatabaseType.MSSQL
oSQL = GetSQLUpdateString(oComment, oGuid) oSQL = GetSQLUpdateString(oComment, oGuid)
MSSQLInstance.ExecuteNonQuery(oSQL) pMSSQLInstance.ExecuteNonQuery(oSQL)
End Select End Select
_Logger.Info($"EmailID [{oGuid.ToString}] has been send to: {oEmailTo}") _Logger.Info($"EmailID [{oGuid.ToString}] has been send to: {oEmailTo}")
@ -469,7 +470,7 @@ Public Class EmailService
oTotalSent.Add(oEmailTo) oTotalSent.Add(oEmailTo)
oFailedSent.Add(oEmailTo) oFailedSent.Add(oEmailTo)
Select Case Database Select Case pDatabase
Case DatabaseType.MSSQL Case DatabaseType.MSSQL
Dim oErrorMessage As String Dim oErrorMessage As String
If String.IsNullOrEmpty(_limilab.ErrorMessage) = False Then If String.IsNullOrEmpty(_limilab.ErrorMessage) = False Then
@ -478,7 +479,7 @@ Public Class EmailService
oErrorMessage = $"Could not sent email to email adress. Check log!" oErrorMessage = $"Could not sent email to email adress. Check log!"
End If End If
oSQL = $"UPDATE TBEMLP_EMAIL_OUT SET EMAIL_SENT = GETDATE(), ERROR_TIMESTAMP = GETDATE(), ERROR_MSG = '{oErrorMessage}' WHERE GUID = {oGuid} " oSQL = $"UPDATE TBEMLP_EMAIL_OUT SET EMAIL_SENT = GETDATE(), ERROR_TIMESTAMP = GETDATE(), ERROR_MSG = '{oErrorMessage}' WHERE GUID = {oGuid} "
MSSQLInstance.ExecuteNonQuery(oSQL) pMSSQLInstance.ExecuteNonQuery(oSQL)
End Select End Select
End If End If

2
Services.EmailService/My Project/AssemblyInfo.vb
View File

@ -32,4 +32,4 @@ Imports System.Runtime.InteropServices
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.7.3.0")> <Assembly: AssemblyVersion("1.7.3.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")> <Assembly: AssemblyFileVersion("1.7.3.0")>

2
Services.ZUGFeRDService/Config.vb
View File

@ -71,6 +71,8 @@
Public Property AllowZugferd2x As Boolean = True Public Property AllowZugferd2x As Boolean = True
Public Property AllowZugferd23x As Boolean = True
Public Property AllowPeppolBISBill3x As Boolean = False Public Property AllowPeppolBISBill3x As Boolean = False
End Class End Class
End Class End Class

6
Services.ZUGFeRDService/My Project/AssemblyInfo.vb
View File

@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyCompany("Digital Data")> <Assembly: AssemblyCompany("Digital Data")>
<Assembly: AssemblyProduct("DDZUGFeRDService")> <Assembly: AssemblyProduct("DDZUGFeRDService")>
<Assembly: AssemblyCopyright("Copyright © 2025")> <Assembly: AssemblyCopyright("Copyright © 2025")>
<Assembly: AssemblyTrademark("2.9.0.0")> <Assembly: AssemblyTrademark("2.9.3.0")>
<Assembly: ComVisible(False)> <Assembly: ComVisible(False)>
@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.9.0.0")> <Assembly: AssemblyVersion("2.9.3.0")>
<Assembly: AssemblyFileVersion("2.9.0.0")> <Assembly: AssemblyFileVersion("2.9.3.0")>

65
Services.ZUGFeRDService/ThreadRunner.vb
View File

@ -52,13 +52,14 @@ Public Class ThreadRunner
.AllowXRechnung = _config.Config.Custom.AllowXRechnung, .AllowXRechnung = _config.Config.Custom.AllowXRechnung,
.AllowZugferd10 = _config.Config.Custom.AllowZugferd10, .AllowZugferd10 = _config.Config.Custom.AllowZugferd10,
.AllowZugferd2x = _config.Config.Custom.AllowZugferd2x, .AllowZugferd2x = _config.Config.Custom.AllowZugferd2x,
.AllowZugferd23x = _config.Config.Custom.AllowZugferd23x,
.AllowPeppolBISBill3x = _config.Config.Custom.AllowPeppolBISBill3x, .AllowPeppolBISBill3x = _config.Config.Custom.AllowPeppolBISBill3x,
.RejectionTemplateId = _config.Config.Custom.RejectionTemplateId, .RejectionTemplateId = _config.Config.Custom.RejectionTemplateId,
.GDPictureVersion = _config.Config.Custom.GDPictureVersion .GDPictureVersion = _config.Config.Custom.GDPictureVersion
} }
oArgs = LoadFolderConfig(oArgs) oArgs = LoadFolderConfig(oArgs)
oArgs = LoadPropertyMap(oArgs) oArgs = LoadPropertyMapListFor(oArgs)
_logger.Debug("Custom Options:") _logger.Debug("Custom Options:")
_logger.Debug("ExceptionEmailAddress: [{0}]", oArgs.ExceptionEmailAddress) _logger.Debug("ExceptionEmailAddress: [{0}]", oArgs.ExceptionEmailAddress)
@ -171,34 +172,44 @@ Public Class ThreadRunner
Return pArgs Return pArgs
End Function End Function
Private Function LoadPropertyMap(pArgs As WorkerArgs) As WorkerArgs Private Function LoadPropertyMapListFor(Args As WorkerArgs) As WorkerArgs
Dim oSQL As String = $"SELECT * FROM TBDD_ZUGFERD_XML_ITEMS WHERE ACTIVE = 1 ORDER BY XML_PATH" Try
Dim oResult As DataTable = _mssql.GetDatatable(oSQL) Args.PropertyMapList.Clear()
For Each oRow As DataRow In oResult.Rows Dim oSQL As String = $"SELECT * FROM TBDD_ZUGFERD_XML_ITEMS WHERE ACTIVE = 1 ORDER BY XML_PATH"
Dim oXmlPath As String = oRow.Item("XML_PATH") Dim oResult As DataTable = _mssql.GetDatatable(oSQL)
Dim oTableName = oRow.Item("TABLE_NAME")
Dim oTableColumn = oRow.Item("TABLE_COLUMN")
Dim oDescription = oRow.Item("DESCRIPTION")
Dim oIsRequired = oRow.Item("IS_REQUIRED")
Dim oIsGrouped = oRow.Item("IS_GROUPED")
Dim oGroupScope = oRow.Item("GROUP_SCOPE")
Dim oSpecification = oRow.Item("SPECIFICATION")
Dim oItemType = oRow.Item("ITEM_TYPE")
pArgs.PropertyMap.Add(oXmlPath, New XmlItemProperty() With { For Each oRow As DataRow In oResult.Rows
.Description = oDescription, Dim xmlPath As String = oRow.Item("XML_PATH")
.TableName = oTableName, Dim tableName = oRow.Item("TABLE_NAME")
.TableColumn = oTableColumn, Dim tableColumn = oRow.Item("TABLE_COLUMN")
.IsRequired = oIsRequired, Dim description = oRow.Item("DESCRIPTION")
.IsGrouped = oIsGrouped, Dim isRequired = oRow.Item("IS_REQUIRED")
.GroupScope = oGroupScope, Dim isGrouped = oRow.Item("IS_GROUPED")
.Specification = oSpecification, Dim groupScope = oRow.Item("GROUP_SCOPE")
.XMLPath = oXmlPath.Replace(".Value", ""), Dim specification = oRow.Item("SPECIFICATION")
.ItemType = oItemType Dim oItemType = oRow.Item("ITEM_TYPE")
}) Dim oEN16931_ID = oRow.Item("EN16931_ID")
Next
Return pArgs Args.PropertyMapList.Add(New XmlItemProperty() With {
.XMLPath = xmlPath,
.Description = description,
.TableName = tableName,
.TableColumn = tableColumn,
.IsRequired = isRequired,
.IsGrouped = isGrouped,
.GroupScope = groupScope,
.Specification = specification,
.ItemType = oItemType,
.EN16931_ID = oEN16931_ID
})
Next
Return Args
Catch ex As Exception
_logger.Error(ex)
Return Args
End Try
End Function End Function
End Class End Class

2
WEBSERVICES/ZUGFeRDRESTService/Config.cs
View File

@ -25,6 +25,8 @@
public bool AllowZugferd2x { get; set; } = true; public bool AllowZugferd2x { get; set; } = true;
public bool AllowZugferd23x { get; set; } = true;
public bool AllowPeppolBISBill3x { get; set; } = false; public bool AllowPeppolBISBill3x { get; set; } = false;
} }

58
WEBSERVICES/ZUGFeRDRESTService/Controllers/ValidationController.cs
View File

@ -11,6 +11,7 @@ using static DigitalData.Modules.Interfaces.PropertyValues;
using System.Data.SqlClient; using System.Data.SqlClient;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using System.Xml.Linq; using System.Xml.Linq;
using Newtonsoft.Json.Linq;
namespace ZUGFeRDRESTService.Controllers namespace ZUGFeRDRESTService.Controllers
{ {
@ -34,12 +35,14 @@ namespace ZUGFeRDRESTService.Controllers
private readonly DigitalData.Modules.Filesystem.File _file; private readonly DigitalData.Modules.Filesystem.File _file;
private readonly PropertyValues _props; private readonly PropertyValues _props;
private readonly Dictionary<string, XmlItemProperty> _propertyMap = new Dictionary<string, XmlItemProperty>(); //private readonly Dictionary<string, XmlItemProperty> _propertyMap = new Dictionary<string, XmlItemProperty>();
private readonly List<XmlItemProperty> _propertyMapList = new List<XmlItemProperty>();
private int _MaxFileSizeInMegabytes; private int _MaxFileSizeInMegabytes;
private bool _AllowFacturX; private bool _AllowFacturX;
private bool _AllowXRechnung; private bool _AllowXRechnung;
private bool _AllowZugferd2x; private bool _AllowZugferd2x;
private bool _AllowZugferd23x;
private bool _AllowZugferd10; private bool _AllowZugferd10;
private bool _AllowPeppolBISBill3x; private bool _AllowPeppolBISBill3x;
@ -60,7 +63,6 @@ namespace ZUGFeRDRESTService.Controllers
_database = database; _database = database;
var oGDPictureKey = database.GetGDPictureKey(); var oGDPictureKey = database.GetGDPictureKey();
var oPropertyMap = database.GetPropertyMap();
_zugferd = new ZUGFeRDInterface(_logConfig, oGDPictureKey, new ZugferdOptions() _zugferd = new ZUGFeRDInterface(_logConfig, oGDPictureKey, new ZugferdOptions()
{ {
@ -68,31 +70,14 @@ namespace ZUGFeRDRESTService.Controllers
AllowXRechnung_Filename = _AllowXRechnung, AllowXRechnung_Filename = _AllowXRechnung,
AllowZugferd_1_0_Schema = _AllowZugferd10, AllowZugferd_1_0_Schema = _AllowZugferd10,
AllowZugferd_2_x_Schema = _AllowZugferd2x, AllowZugferd_2_x_Schema = _AllowZugferd2x,
AllowZugferd_2_3_x_Schema = _AllowZugferd23x,
AllowPeppol_3_x_Schema = _AllowPeppolBISBill3x AllowPeppol_3_x_Schema = _AllowPeppolBISBill3x
}); });
_props = new PropertyValues(_logConfig); _props = new PropertyValues(_logConfig);
_logger.Debug("Property Map initial: [{0}] entries found.", oPropertyMap.Count); var oPropertyMapList = database.GetPropertyMapList();
_propertyMapList.AddRange(oPropertyMapList);
if (_AllowZugferd10 == true) _logger.Debug("Property Map list initial: [{0}] entries found. [{1}] entries will be available.", oPropertyMapList.Count, _propertyMapList.Count);
_propertyMap = oPropertyMap.
Where(kv => kv.Value.Specification == ZUGFERD_SPEC_10 || kv.Value.Specification == ZUGFERD_SPEC_DEFAULT).
Concat(_propertyMap).
ToDictionary(kv => kv.Key, kv => kv.Value);
if (_AllowZugferd2x == true)
_propertyMap = oPropertyMap.
Where(kv => kv.Value.Specification == ZUGFERD_SPEC_2x).
Concat(_propertyMap).
ToDictionary(kv => kv.Key, kv => kv.Value);
if (_AllowPeppolBISBill3x == true)
_propertyMap = oPropertyMap.
Where(kv => kv.Value.Specification == UBL_SPEC_21).
Concat(_propertyMap).
ToDictionary(kv => kv.Key, kv => kv.Value);
_logger.Debug("Property Map filtered: [{0}] entries found.", _propertyMap.Count);
_logger.Debug("Validation Controller initialized!"); _logger.Debug("Validation Controller initialized!");
} }
@ -120,6 +105,12 @@ namespace ZUGFeRDRESTService.Controllers
_AllowZugferd2x = false; _AllowZugferd2x = false;
} }
if (!bool.TryParse(oZugferdConfig["AllowZugferd23x"], out _AllowZugferd23x))
{
_logger.Info("Configuration Zugferd23x was not set. Using default value [{0}]", false);
_AllowZugferd23x = false;
}
if (!bool.TryParse(oZugferdConfig["AllowZugferd10"], out _AllowZugferd10)) if (!bool.TryParse(oZugferdConfig["AllowZugferd10"], out _AllowZugferd10))
{ {
_logger.Info("Configuration Zugferd10 was not set. Using default value [{0}]", true); _logger.Info("Configuration Zugferd10 was not set. Using default value [{0}]", true);
@ -193,7 +184,7 @@ namespace ZUGFeRDRESTService.Controllers
_logger.Info("Detected Specification was: [{0}]", oZugferdResult.Specification); _logger.Info("Detected Specification was: [{0}]", oZugferdResult.Specification);
var oFilteredPropertyMap = _zugferd.FilterPropertyMap(_propertyMap, oZugferdResult.Specification); var oFilteredPropertyMap = _zugferd.FilterPropertyMap(_propertyMapList, oZugferdResult.Specification);
if (oFilteredPropertyMap.Count == 0) if (oFilteredPropertyMap.Count == 0)
{ {
@ -387,15 +378,32 @@ namespace ZUGFeRDRESTService.Controllers
return true; return true;
} }
if (pProperty.ItemType == 0 && string.IsNullOrEmpty(pProperty.Value.ToString()))
{
// Leere Texte speichern wir nicht in der DB
return true;
}
var oSql = $"INSERT INTO {pProperty.TableName} " + var oSql = $"INSERT INTO {pProperty.TableName} " +
"(REFERENCE_GUID, ITEM_DESCRIPTION, ITEM_VALUE, CREATEDWHO, SPEC_NAME, GROUP_COUNTER, IS_REQUIRED) VALUES " + "(REFERENCE_GUID, ITEM_DESCRIPTION, ITEM_VALUE, CREATEDWHO, SPEC_NAME, GROUP_COUNTER, IS_REQUIRED) VALUES " +
"(@REFERENCE_GUID, @ITEM_DESCRIPTION, @ITEM_VALUE, @CREATEDWHO, @SPEC_NAME, @GROUP_COUNTER, @IS_REQUIRED)"; "(@REFERENCE_GUID, @ITEM_DESCRIPTION, @ITEM_VALUE, @CREATEDWHO, @SPEC_NAME, @GROUP_COUNTER, @IS_REQUIRED)";
string itemValue = string.Empty;
if (pProperty.Value.Length > 900)
{
itemValue = pProperty.Value.Substring(1, 899);
_logger.Warn("Value for field [{0}] is longer than 900 characters, will be truncated!", pProperty.TableColumn);
}
else
{
itemValue = pProperty.Value;
}
var oParams = new SqlParameter[] var oParams = new SqlParameter[]
{ {
new SqlParameter("@REFERENCE_GUID", pMessageId), new SqlParameter("@REFERENCE_GUID", pMessageId),
new SqlParameter("@ITEM_DESCRIPTION", pProperty.Description), new SqlParameter("@ITEM_DESCRIPTION", pProperty.Description),
new SqlParameter("@ITEM_VALUE", pProperty.Value), new SqlParameter("@ITEM_VALUE", itemValue.Replace("'", "''")),
new SqlParameter("@CREATEDWHO", ADDED_WHO), new SqlParameter("@CREATEDWHO", ADDED_WHO),
new SqlParameter("@GROUP_COUNTER", pProperty.GroupCounter), new SqlParameter("@GROUP_COUNTER", pProperty.GroupCounter),
new SqlParameter("@SPEC_NAME", pProperty.TableColumn), new SqlParameter("@SPEC_NAME", pProperty.TableColumn),

27
WEBSERVICES/ZUGFeRDRESTService/Database.cs
View File

@ -13,7 +13,7 @@ namespace ZUGFeRDRESTService
{ {
private DigitalData.Modules.Logging.Logger _Logger = null; private DigitalData.Modules.Logging.Logger _Logger = null;
private string _gdPictureKey = null; private string _gdPictureKey = null;
private Dictionary<string, XmlItemProperty> _propertyMap = null; private List<XmlItemProperty> _propertyMapList = null;
private LogConfig _logConfig = null; private LogConfig _logConfig = null;
private string _connString; private string _connString;
@ -48,21 +48,22 @@ namespace ZUGFeRDRESTService
return _gdPictureKey; return _gdPictureKey;
} }
public Dictionary<string, XmlItemProperty> GetPropertyMap() public List<XmlItemProperty> GetPropertyMapList()
{ {
if (_propertyMap == null) if (_propertyMapList == null)
{ {
_Logger.Debug("Property map does not exist, creating."); _Logger.Debug("Property map list does not exist, creating.");
_propertyMap = new Dictionary<string, XmlItemProperty>(); _propertyMapList = new List<XmlItemProperty>();
var oDatatable = MSSQL.GetDatatable(QUERY_GET_PROPERTY_MAP); var oDatatable = MSSQL.GetDatatable(QUERY_GET_PROPERTY_MAP);
_Logger.Debug("Datatable Rows: [{0}]", oDatatable.Rows); _Logger.Debug("Datatable Rows: [{0}]", oDatatable.Rows.Count);
foreach (DataRow oRow in oDatatable.Rows) foreach (DataRow oRow in oDatatable.Rows)
{ {
_propertyMap.Add(oRow["XML_PATH"].ToString(), new XmlItemProperty() _propertyMapList.Add(new XmlItemProperty()
{ {
XMLPath = oRow["XML_PATH"].ToString(),
Description = oRow["DESCRIPTION"].ToString(), Description = oRow["DESCRIPTION"].ToString(),
TableName = oRow["TABLE_NAME"].ToString(), TableName = oRow["TABLE_NAME"].ToString(),
TableColumn = oRow["TABLE_COLUMN"].ToString(), TableColumn = oRow["TABLE_COLUMN"].ToString(),
@ -70,17 +71,19 @@ namespace ZUGFeRDRESTService
IsRequired = (bool)oRow["IS_REQUIRED"], IsRequired = (bool)oRow["IS_REQUIRED"],
IsGrouped = (bool)oRow["IS_GROUPED"], IsGrouped = (bool)oRow["IS_GROUPED"],
Specification = oRow["SPECIFICATION"].ToString(), Specification = oRow["SPECIFICATION"].ToString(),
ItemType = oRow["ITEM_TYPE"] != null ? Convert.ToInt32(oRow["ITEM_TYPE"]) : 0 ItemType = oRow["ITEM_TYPE"] != null ? Convert.ToInt32(oRow["ITEM_TYPE"]) : 0,
EN16931_ID = oRow["EN16931_ID"] != null ? oRow["EN16931_ID"].ToString() : "-"
}); });
} }
} else }
else
{ {
_Logger.Debug("Property map already exists, returning."); _Logger.Debug("Property map list already exists, returning.");
} }
_Logger.Debug("Returning Property Map with [{0}] entries.", _propertyMap.Count); _Logger.Debug("Returning Property Map list with [{0}] entries.", _propertyMapList.Count);
return _propertyMap; return _propertyMapList;
} }
} }
} }

3
WEBSERVICES/ZUGFeRDRESTService/IDatabase.cs
View File

@ -10,6 +10,7 @@ namespace ZUGFeRDRESTService
public MSSQLServer MSSQL { get; set; } public MSSQLServer MSSQL { get; set; }
public string GetGDPictureKey(); public string GetGDPictureKey();
public Dictionary<String, XmlItemProperty> GetPropertyMap();
public List<XmlItemProperty> GetPropertyMapList();
} }
} }

1
WEBSERVICES/ZUGFeRDRESTService/appsettings.json
View File

@ -21,6 +21,7 @@
"Zugferd": { "Zugferd": {
"AllowZugferd10": true, "AllowZugferd10": true,
"AllowZugferd2x": false, "AllowZugferd2x": false,
"AllowZugferd23x": false,
"AllowFacturX": false, "AllowFacturX": false,
"AllowXRechnung": false, "AllowXRechnung": false,
"AllowPeppolBISBill3x": false "AllowPeppolBISBill3x": false