Messaging: WIP Email2

GUIs.Test.ZUGFeRDTest/Form1.vb

@@ -109,11 +109,17 @@ Public Class Form1
 
     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")
 
         If oResult = DialogResult.OK Then
             Dim oDoc = _zugferd.ValidateZUGFeRDFileWithGDPicture(OpenFileDialog1.FileName)
             Dim oZUGFERD = _zugferd.SerializeZUGFeRDDocument(oDoc)
             Console.WriteLine()
+
+            Dim oResult2 = _zugferd.PropertyValues.CheckPropertyValues(oZUGFERD, oArgs.PropertyMap, "test")
+
+            Console.WriteLine()
         End If
     End Sub
 

GUIs.ZooFlow/frmtest.Designer.vb

@@ -41,8 +41,9 @@ Partial Class frmtest
         Me.Label1 = New System.Windows.Forms.Label()
         Me.GroupBox1 = New System.Windows.Forms.GroupBox()
         Me.ListBox1 = New System.Windows.Forms.ListBox()
-        Me.Button1 = New System.Windows.Forms.Button()
         Me.txtAttributeName = New System.Windows.Forms.TextBox()
+        Me.Button2 = New System.Windows.Forms.Button()
+        Me.txtAttibuteValue = New System.Windows.Forms.TextBox()
         Me.GroupBox1.SuspendLayout()
         Me.SuspendLayout()
         '
@@ -210,28 +211,36 @@ Partial Class frmtest
         Me.ListBox1.Size = New System.Drawing.Size(200, 329)
         Me.ListBox1.TabIndex = 23
         '
-        'Button1
-        '
-        Me.Button1.Location = New System.Drawing.Point(205, 142)
-        Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(187, 23)
-        Me.Button1.TabIndex = 17
-        Me.Button1.Text = "GetAttribute"
-        Me.Button1.UseVisualStyleBackColor = True
-        '
         'txtAttributeName
         '
-        Me.txtAttributeName.Location = New System.Drawing.Point(398, 144)
+        Me.txtAttributeName.Location = New System.Drawing.Point(205, 236)
         Me.txtAttributeName.Name = "txtAttributeName"
-        Me.txtAttributeName.Size = New System.Drawing.Size(165, 20)
+        Me.txtAttributeName.Size = New System.Drawing.Size(115, 20)
         Me.txtAttributeName.TabIndex = 24
         Me.txtAttributeName.Text = "InvoiceNr"
         '
+        'Button2
+        '
+        Me.Button2.Location = New System.Drawing.Point(12, 234)
+        Me.Button2.Name = "Button2"
+        Me.Button2.Size = New System.Drawing.Size(187, 23)
+        Me.Button2.TabIndex = 17
+        Me.Button2.Text = "GetAttribute"
+        Me.Button2.UseVisualStyleBackColor = True
+        '
+        'txtAttibuteValue
+        '
+        Me.txtAttibuteValue.Location = New System.Drawing.Point(326, 236)
+        Me.txtAttibuteValue.Name = "txtAttibuteValue"
+        Me.txtAttibuteValue.Size = New System.Drawing.Size(100, 20)
+        Me.txtAttibuteValue.TabIndex = 25
+        '
         'frmtest
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(865, 450)
+        Me.Controls.Add(Me.txtAttibuteValue)
         Me.Controls.Add(Me.txtAttributeName)
         Me.Controls.Add(Me.ListBox1)
         Me.Controls.Add(Me.GroupBox1)
@@ -241,7 +250,7 @@ Partial Class frmtest
         Me.Controls.Add(Me.Label5)
         Me.Controls.Add(Me.Label1)
         Me.Controls.Add(Me.Label4)
-        Me.Controls.Add(Me.Button1)
+        Me.Controls.Add(Me.Button2)
         Me.Controls.Add(Me.Button8)
         Me.Controls.Add(Me.Button6)
         Me.Controls.Add(Me.Button7)
@@ -278,6 +287,7 @@ Partial Class frmtest
     Friend WithEvents Label1 As Label
     Friend WithEvents GroupBox1 As GroupBox
     Friend WithEvents ListBox1 As ListBox
-    Friend WithEvents Button1 As Button
     Friend WithEvents txtAttributeName As TextBox
+    Friend WithEvents Button2 As Button
+    Friend WithEvents txtAttibuteValue As TextBox
 End Class

GUIs.ZooFlow/frmtest.vb

@@ -115,7 +115,7 @@ Public Class frmtest
         cmbObjectStoreType.SelectedIndex = 0
     End Sub
 
-    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button2.Click
         Try
             Dim oValue = My.Application.Service.Client.GetVariableValue(txtIDB_OBJ_ID.Text, txtAttributeName.Text)
 
@@ -123,6 +123,7 @@ Public Class frmtest
                 ListBox1.Items.Add("Value is nothing")
             Else
                 ListBox1.Items.Add(oValue.Value)
+                txtAttibuteValue.Text = oValue.Value
             End If
 
         Catch ex As Exception

Modules.EDMIAPI/Client.vb

@@ -337,6 +337,11 @@ Public Class Client
         Try
             ' Get Attributes and Values from Database
             Dim oAttributes As List(Of ObjectAttribute) = GetAttributesForObject(pObjectId, pOptions.UserLanguage)
+
+            If oAttributes Is Nothing Then
+                Return New VariableValue()
+            End If
+
             Dim oValues = oAttributes.AsEnumerable().
                 Where(Function(pAttr)
                           Return pAttr.Title.ToUpper = pAttributeName.ToUpper
@@ -408,56 +413,6 @@ Public Class Client
         End Try
     End Function
 
-    Private Class ObjectAttribute
-        Public Property Id As Long
-        Public Property Title As String
-        Public Property Type As String
-
-        Public Property ValueBigInt As Long
-        Public Property ValueText As String
-        Public Property ValueDecimal As Decimal
-        Public Property ValueDate As DateTime
-
-        Public ReadOnly Property Value As Object
-            Get
-                Return GetValue()
-            End Get
-        End Property
-
-        Private Function GetValue() As Object
-            Select Case Type
-                Case AttributeTypeName.VECTOR_INTEGER
-                    Return ValueBigInt
-
-                Case AttributeTypeName.BIG_INTEGER
-                    Return ValueBigInt
-
-                Case AttributeTypeName.VECTOR_STRING
-                    Return ValueText
-
-                Case AttributeTypeName.VARCHAR
-                    Return ValueText
-
-                Case AttributeTypeName.BIT
-                    Return IIf(ValueBigInt = 1, True, False)
-
-                Case AttributeTypeName.DATE
-                    Return ValueDate
-
-                Case AttributeTypeName.DATETIME
-                    Return ValueDate
-
-                Case AttributeTypeName.DECIMAL
-                    Return ValueDecimal
-
-                Case AttributeTypeName.FLOAT
-                    Return ValueDecimal
-
-                Case Else
-                    Return Nothing
-            End Select
-        End Function
-    End Class
 
     Private Function GetAttributesForObject(pObjectId As Long, pLanguage As String) As List(Of ObjectAttribute)
         Dim oAttributes As New List(Of ObjectAttribute)
@@ -757,5 +712,58 @@ Public Class Client
             Value = pValue
         End Sub
     End Class
+
+
 #End Region
+
+    Private Class ObjectAttribute
+        Public Property Id As Long
+        Public Property Title As String
+        Public Property Type As String
+
+        Public Property ValueBigInt As Long
+        Public Property ValueText As String
+        Public Property ValueDecimal As Decimal
+        Public Property ValueDate As DateTime
+
+        Public ReadOnly Property Value As Object
+            Get
+                Return GetValue()
+            End Get
+        End Property
+
+        Private Function GetValue() As Object
+            Select Case Type
+                Case AttributeTypeName.VECTOR_INTEGER
+                    Return ValueBigInt
+
+                Case AttributeTypeName.BIG_INTEGER
+                    Return ValueBigInt
+
+                Case AttributeTypeName.VECTOR_STRING
+                    Return ValueText
+
+                Case AttributeTypeName.VARCHAR
+                    Return ValueText
+
+                Case AttributeTypeName.BIT
+                    Return IIf(ValueBigInt = 1, True, False)
+
+                Case AttributeTypeName.DATE
+                    Return ValueDate
+
+                Case AttributeTypeName.DATETIME
+                    Return ValueDate
+
+                Case AttributeTypeName.DECIMAL
+                    Return ValueDecimal
+
+                Case AttributeTypeName.FLOAT
+                    Return ValueDecimal
+
+                Case Else
+                    Return Nothing
+            End Select
+        End Function
+    End Class
 End Class

Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb

@@ -269,10 +269,16 @@ Public Class ImportZUGFeRDFiles
                                 ' - a List of missing properties
                                 Dim oCheckResult = _zugferd.PropertyValues.CheckPropertyValues(oDocument, oArgs.PropertyMap, oMessageId)
 
+                                _logger.Info("Properties checked: [{0}] missing properties / [{1}] valid properties found.", oCheckResult.MissingProperties.Count, oCheckResult.ValidProperties.Count)
+
                                 If oCheckResult.MissingProperties.Count > 0 Then
+                                    _logger.Warn("[{0}] missing properties found. Exiting.", oCheckResult.MissingProperties.Count)
                                     oMissingProperties = oCheckResult.MissingProperties
                                     Throw New MissingValueException(oFile)
                                 End If
+
+                                _logger.Debug("No missing properties found. Continuing.")
+
                                 Dim oDelSQL = $"DELETE FROM TBEDMI_ITEM_VALUE where REFERENCE_GUID = '{oMessageId}'"
                                 Dim oStep As String
 

Modules.Jobs/My Project/AssemblyInfo.vb

@@ -30,5 +30,5 @@ Imports System.Runtime.InteropServices
 ' Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 ' übernehmen, indem Sie "*" eingeben:
 
-<Assembly: AssemblyVersion("1.7.7.0")>
+<Assembly: AssemblyVersion("1.7.8.0")>
-<Assembly: AssemblyFileVersion("1.7.7.0")>
+<Assembly: AssemblyFileVersion("1.7.8.0")>

Modules.Messaging/Email2.vb

@@ -344,7 +344,8 @@ Public Class Email2
         Try
             Dim oTempPath As String = IO.Path.GetTempPath()
             Dim oFileNameWithoutExtension = Path.GetFileNameWithoutExtension(pMsgFile)
-            Dim oEmlPath As String = IO.Path.Combine(oTempPath, $"{oFileNameWithoutExtension}.eml")
+            Dim oFileNameWithoutInvalidChars = Language.Utils.RemoveInvalidCharacters(oFileNameWithoutExtension)
+            Dim oEmlPath As String = IO.Path.Combine(oTempPath, $"{oFileNameWithoutInvalidChars}.eml")
             Dim oVersionedPath As String = FileEx.GetVersionedFilename(oEmlPath)
 
             Using oConverter As New MsgConverter(pMsgFile)

Modules.Messaging/Messaging.vbproj

@@ -127,6 +127,10 @@
       <Project>{991d0231-4623-496d-8bd0-9ca906029cbc}</Project>
       <Name>Filesystem</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Modules.Language\Language.vbproj">
+      <Project>{d3c8cfed-d6f6-43a8-9bdf-454145d0352f}</Project>
+      <Name>Language</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Modules.Logging\Logging.vbproj">
       <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
       <Name>Logging</Name>