WIP

ImporterShared/Documents/Document.vb

@@ -9,8 +9,6 @@ Namespace Documents
         Public Schema As Schema
         Public Mandator As Mandator
 
-        Public Selected As Boolean = False
-
         Public TemplateName As String
         Public TemplateType As Integer
         Public [Option] As Integer
@@ -21,6 +19,8 @@ Namespace Documents
         ''' </summary>
         Public Property Rows As New List(Of DocumentRow)
 
+        Public Property Selected As Boolean = False
+
         Public ReadOnly Property MandatorId As String
             Get
                 Return Mandator?.Id

ImporterShared/Documents/DocumentLoader.vb

@@ -1,4 +1,5 @@
-Imports System.IO
+Imports System.Globalization
+Imports System.IO
 Imports DigitalData.Modules.Logging
 Imports ImporterShared.Schemas
 Imports ImporterShared.Winline
@@ -33,7 +34,6 @@ Namespace Documents
                 Logger.Debug("Found [{0}] files in directory [{1}]", oFiles.Count, oDirectory)
 
                 For Each oFile In oFiles
-                    ' TODO: Supply currently selected mandator when the mandator selection works
                     Dim oDocument = LoadFile(oFile, pSchema, pMandator)
                     Files.Add(oDocument)
                 Next
@@ -129,9 +129,17 @@ Namespace Documents
                         Where(Function(c) c.Name = oSubElement.Name).
                         SingleOrDefault()
 
+                    Dim oValue = oSubElement.Value
+
+                    ' TODO: Needed when we have time for date times
+                    'If oSchemaField.DataType = Constants.ColumnType.Date Then
+                    '    Dim oDate = Date.ParseExact(oValue, "yyyy-MM-dd", CultureInfo.InvariantCulture)
+                    '    oValue = oDate.ToString("d")
+                    'End If
+
                     oFields.Add(oSubElement.Name.ToString, New DocumentRow.FieldValue With {
-                        .Original = oSubElement.Value,
-                        .Final = oSubElement.Value,
+                        .Original = oValue,
+                        .Final = oValue,
                         .DataType = oSchemaField.DataType
                     })
                 Next

ImporterShared/Documents/DocumentRow.vb

@@ -15,7 +15,7 @@
         Public Original As String = ""
         Public External As String = ""
         Public Final As String = ""
-        Public DataType As Constants.ColumnType = Constants.ColumnType.String
+        Public Property DataType As Constants.ColumnType = Constants.ColumnType.String
 
         Public Overrides Function ToString() As String
             Return Final