Mark documents as imported and clean them up when closing app, update to DevExpress 21, small tweaks

2021-12-20 11:57:41 +01:00
parent 51c053769e
commit 3b0474e713
30 changed files with 3011 additions and 285 deletions
--- a/MultiTool.Shared/Documents/Document.vb
+++ b/MultiTool.Shared/Documents/Document.vb
@@ -20,6 +20,7 @@ Namespace Documents
        Public Property Rows As New List(Of DocumentRow)

        Public Property Selected As Boolean = False
+        Public Property Imported As Boolean = False

        Public ReadOnly Property HasErrors As Boolean
            Get
--- a/MultiTool.Shared/Documents/DocumentCleaner.vb
+++ b/MultiTool.Shared/Documents/DocumentCleaner.vb
@@ -0,0 +1,37 @@
+Imports System.IO
+Imports DigitalData.Modules.Logging
+Imports MultiTool.Shared.Templates
+
+Namespace Documents
+    Public Class DocumentCleaner
+        Inherits BaseClass
+
+        Private ReadOnly GeneralConfig As GeneralConfig
+        Private ReadOnly FileEx As DigitalData.Modules.Filesystem.File
+
+        Public Sub New(pLogConfig As LogConfig, pGeneralConfig As GeneralConfig)
+            MyBase.New(pLogConfig)
+            GeneralConfig = pGeneralConfig
+            FileEx = New DigitalData.Modules.Filesystem.File(LogConfig)
+        End Sub
+
+        Public Function CleanImportedDocuments(pDocuments As List(Of Document)) As Boolean
+            Dim oResult = True
+            Dim oOutputDirectory = FileEx.GetDateDirectory(GeneralConfig.OutputXmlFileDirectory)
+
+            For Each oDocument As Document In pDocuments
+                Try
+                    Dim oFileinfo = New FileInfo(oDocument.FullName)
+                    Dim oDestination = Path.Combine(oOutputDirectory, oFileinfo.Name)
+                    File.Move(oFileinfo.FullName, oDestination)
+                Catch ex As Exception
+                    Logger.Warn("File [{0}] could not be moved to output directory!", oDocument.FullName)
+                    Logger.Error(ex)
+                    oResult = False
+                End Try
+            Next
+
+            Return oResult
+        End Function
+    End Class
+End Namespace
--- a/MultiTool.Shared/Documents/DocumentLoader.vb
+++ b/MultiTool.Shared/Documents/DocumentLoader.vb
@@ -247,7 +247,7 @@ Namespace Documents
                Logger.Warn("Mandator not found for File [{0}]", pDocument.File.Name)
            Else
                pDocument = MatchDocumentDataFromHardcodedMappings(pDocument, oMandator, pTemplate)
-                pDocument = MatchDocumentDataFromDynamicMappings(pDocument, oMandator, MappingConfig)
+                pDocument = MatchDocumentDataFromDynamicMappings(pDocument, oMandator)
            End If

            pDocument.Mandator = oMandator
@@ -289,7 +289,7 @@ Namespace Documents
            Return pDocument
        End Function

-        Private Function MatchDocumentDataFromDynamicMappings(pDocument As Document, pMandator As Mandator, pMappingConfig As MappingConfig) As Document
+        Private Function MatchDocumentDataFromDynamicMappings(pDocument As Document, pMandator As Mandator) As Document
            If pMandator Is Nothing Then
                Return pDocument
            End If
@@ -326,18 +326,6 @@ Namespace Documents
                    ' don't do anything

                End If
-
-                'Dim oRow = pDocument.Rows.Where(Function(row)
-                '                                    Dim oTempRow = row.Fields.Where(Function(field) field.Key = oMapping.SourceItem).FirstOrDefault()
-                '                                    If IsNothing(oTempRow) Then
-                '                                        Return False
-                '                                    Else Return True
-                '                                    End If
-                '                                End Function).FirstOrDefault()
-                'Dim oField = oRow.Fields.Where(Function(field) field.Key = oMapping.SourceItem).FirstOrDefault()
-
-                Console.WriteLine()
-
            Next

            Return pDocument
--- a/MultiTool.Shared/Helpers.vb
+++ b/MultiTool.Shared/Helpers.vb
@@ -1,38 +1,9 @@
 Imports DigitalData.Modules.Logging

 Public Class Helpers
-    Private LogConfig As LogConfig
-    Private Logger As Logger
+    Inherits BaseClass

    Public Sub New(pLogConfig As LogConfig)
-        LogConfig = pLogConfig
-        Logger = pLogConfig.GetLogger()
+        MyBase.New(pLogConfig)
    End Sub
-
-    Public Function GetDateDirectory(pBaseDirectory As String)
-        Dim oDateDirectory = GetDateString()
-        Dim oFinalDirectory As String = IO.Path.Combine(pBaseDirectory, oDateDirectory)
-
-        If IO.Directory.Exists(oFinalDirectory) = False Then
-            Try
-                IO.Directory.CreateDirectory(oFinalDirectory)
-            Catch ex As Exception
-                Logger.Error(ex)
-            End Try
-        End If
-
-        Return oFinalDirectory
-    End Function
-
-    Public Function GetDateString() As String
-        Return $"{Now:yyyy\\MM\\dd}"
-    End Function
-
-    Public Function GetDateTimeString() As String
-        Return $"{Now:yyyy-MM-dd_hh-mm-ffff}"
-    End Function
-
-    Public Function GetFilenameWithSuffix(pBaseString As String, pSuffix As String, pExtension As String)
-        Return $"{pBaseString}-{pSuffix}.{pExtension}"
-    End Function
 End Class
--- a/MultiTool.Shared/MultiTool.Shared.vbproj
+++ b/MultiTool.Shared/MultiTool.Shared.vbproj
@@ -47,9 +47,9 @@
    <Reference Include="AutoMapper, Version=10.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
      <HintPath>..\packages\AutoMapper.10.1.1\lib\net461\AutoMapper.dll</HintPath>
    </Reference>
-    <Reference Include="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.DataAccess.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Printing.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.DataAccess.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Printing.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DigitalData.Modules.Config">
      <HintPath>..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
    </Reference>
@@ -102,6 +102,7 @@
    <Compile Include="Constants.vb" />
    <Compile Include="DataRowEx.vb" />
    <Compile Include="Documents\Document.vb" />
+    <Compile Include="Documents\DocumentCleaner.vb" />
    <Compile Include="Documents\DocumentRow.vb" />
    <Compile Include="Documents\DocumentType.vb" />
    <Compile Include="Documents\DocumentLoader.vb" />
--- a/MultiTool.Shared/MultiTool.Shared.vbproj.bak
+++ b/MultiTool.Shared/MultiTool.Shared.vbproj.bak
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>MultiTool.Shared</RootNamespace>
+    <AssemblyName>MultiTool.Shared</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <MyType>Windows</MyType>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DocumentationFile>MultiTool.Shared.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DocumentationFile>MultiTool.Shared.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionExplicit>On</OptionExplicit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionCompare>Binary</OptionCompare>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionStrict>Off</OptionStrict>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionInfer>On</OptionInfer>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="AutoMapper, Version=10.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.10.1.1\lib\net461\AutoMapper.dll</HintPath>
+    </Reference>
+    <Reference Include="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.DataAccess.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Printing.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DigitalData.Modules.Config">
+      <HintPath>..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Database">
+      <HintPath>..\..\DDMonorepo\Modules.Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Filesystem">
+      <HintPath>..\..\DDMonorepo\Modules.Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Interfaces">
+      <HintPath>..\..\DDMonorepo\Modules.Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Language">
+      <HintPath>..\..\DDMonorepo\Modules.Language\bin\Release\DigitalData.Modules.Language.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Logging">
+      <HintPath>..\..\DDMonorepo\Modules.Logging\bin\Release\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.4.7.10\lib\net45\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
+  </ItemGroup>
+  <ItemGroup>
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="System" />
+    <Import Include="System.Collections" />
+    <Import Include="System.Collections.Generic" />
+    <Import Include="System.Data" />
+    <Import Include="System.Diagnostics" />
+    <Import Include="System.Linq" />
+    <Import Include="System.Xml.Linq" />
+    <Import Include="System.Threading.Tasks" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="BaseClass.vb" />
+    <Compile Include="Config.vb" />
+    <Compile Include="Constants.vb" />
+    <Compile Include="DataRowEx.vb" />
+    <Compile Include="Documents\Document.vb" />
+    <Compile Include="Documents\DocumentRow.vb" />
+    <Compile Include="Documents\DocumentType.vb" />
+    <Compile Include="Documents\DocumentLoader.vb" />
+    <Compile Include="Exceptions.vb" />
+    <Compile Include="Helpers.vb" />
+    <Compile Include="IDictionaryEx.vb" />
+    <Compile Include="IEnumerableEx.vb" />
+    <Compile Include="Mapper.vb" />
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <Compile Include="My Project\Application.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Application.myapp</DependentUpon>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <Compile Include="My Project\Resources.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Settings.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <Compile Include="Report\ReportGenerator.vb" />
+    <Compile Include="Templates\GeneralConfig.vb" />
+    <Compile Include="Templates\MandatorConfig.vb" />
+    <Compile Include="Templates\MandatorConfigItem.vb" />
+    <Compile Include="Templates\MappingConfig.vb" />
+    <Compile Include="Templates\MappingConfigItem.vb" />
+    <Compile Include="Report\ReportHead.vb" />
+    <Compile Include="Report\ReportPosition.vb" />
+    <Compile Include="Report\ReportSource.vb" />
+    <Compile Include="Winline\Entities\Response.vb" />
+    <Compile Include="Templates\Template.vb" />
+    <Compile Include="Templates\TemplateLoader.vb" />
+    <Compile Include="Serializer.vb" />
+    <Compile Include="Templates\TemplateConfig.vb" />
+    <Compile Include="Winline\Entities\Account.vb" />
+    <Compile Include="Winline\WinlineData.vb" />
+    <Compile Include="Winline\Entities\Article.vb" />
+    <Compile Include="Winline\Entities\Contact.vb" />
+    <Compile Include="Winline\Entities\DocumentKind.vb" />
+    <Compile Include="Winline\Entities\Mandator.vb" />
+    <Compile Include="Templates\TemplateConfigItem.vb" />
+    <Compile Include="Winline\WebServiceData.vb" />
+    <Compile Include="XmlData.vb" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="My Project\Resources.resx">
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="My Project\Application.myapp">
+      <Generator>MyApplicationCodeGenerator</Generator>
+      <LastGenOutput>Application.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="My Project\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <CustomToolNamespace>My</CustomToolNamespace>
+      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+</Project>
--- a/MultiTool.Shared/Report/ReportGenerator.vb
+++ b/MultiTool.Shared/Report/ReportGenerator.vb
@@ -13,17 +13,19 @@ Public Class ReportGenerator(Of TReport As IReport)
    Private ReadOnly Database As MSSQLServer
    Private ReadOnly TemplateConfig As TemplateConfig
    Private ReadOnly GeneralConfig As GeneralConfig
+    Private ReadOnly FileEx As DigitalData.Modules.Filesystem.File

    Public Sub New(pLogConfig As LogConfig, pDatabase As MSSQLServer, pTemplateConfig As TemplateConfig, pGeneralConfig As GeneralConfig)
        MyBase.New(pLogConfig)
        Database = pDatabase
        GeneralConfig = pGeneralConfig
        TemplateConfig = pTemplateConfig
+        FileEx = New DigitalData.Modules.Filesystem.File(LogConfig)
    End Sub

    Public Function GetReportFilePath(pDocument As Document)
-        Dim oFinalDirectory = Helpers.GetDateDirectory(GeneralConfig.OutputReportDirectory)
-        Dim oFileName = Helpers.GetFilenameWithSuffix(IO.Path.GetFileNameWithoutExtension(pDocument.File.Name), Helpers.GetDateTimeString, "pdf")
+        Dim oFinalDirectory = FileEx.GetDateDirectory(GeneralConfig.OutputReportDirectory)
+        Dim oFileName = FileEx.GetFilenameWithSuffix(IO.Path.GetFileNameWithoutExtension(pDocument.File.Name), FileEx.GetDateTimeString, "pdf")
        Dim oFilePath As String = IO.Path.Combine(oFinalDirectory, oFileName)
        Return oFilePath
    End Function
--- a/MultiTool.Shared/Templates/GeneralConfig.vb
+++ b/MultiTool.Shared/Templates/GeneralConfig.vb
@@ -16,6 +16,12 @@
            End Get
        End Property

+        Public ReadOnly Property OutputXmlFileDirectory
+            Get
+                Return IO.Path.Combine(OutputDirectory, "XmlFiles")
+            End Get
+        End Property
+
        Public Property Webservice As New WebServiceConfig()
        Public Property DefaultYearOverride As Integer = 0

--- a/MultiTool.Shared/Winline/WebServiceData.vb
+++ b/MultiTool.Shared/Winline/WebServiceData.vb
@@ -1,6 +1,7 @@
 Imports System.Net.Http
 Imports System.Text
 Imports System.Xml
+Imports DigitalData.Modules.Filesystem
 Imports DigitalData.Modules.Logging
 Imports MultiTool.Shared.Documents
 Imports MultiTool.Shared.Templates.GeneralConfig
@@ -13,6 +14,7 @@ Namespace Winline
        Private ReadOnly Config As WebServiceConfig
        Private ReadOnly Serializer As Serializer
        Private ReadOnly OutputDirectory As String
+        Private ReadOnly FileEx As File

        Public Event WebServiceProgress As EventHandler(Of String)

@@ -21,6 +23,7 @@ Namespace Winline
            Serializer = New Serializer(pLogConfig)
            Config = pWebserviceConfig
            OutputDirectory = pOutputDirectoryPath
+            FileEx = New DigitalData.Modules.Filesystem.File(LogConfig)
        End Sub

        Public Sub RaiseWebServiceProgress(pMessage As String)
@@ -32,21 +35,21 @@ Namespace Winline
            Dim oWS = Config

            ' --- Get and create path for request/response files
-            Dim oOutputDirectory = Helpers.GetDateDirectory(OutputDirectory)
+            Dim oOutputDirectory = FileEx.GetDateDirectory(OutputDirectory)

            RaiseEvent WebServiceProgress(Me, "Einstellungen laden")

            ' --- Build all teh filenamez and pathz

-            Dim oBaseFileName As String = Helpers.GetDateTimeString()
-            Dim oFileName = Helpers.GetFilenameWithSuffix(oBaseFileName, "Request", "xml")
+            Dim oBaseFileName As String = FileEx.GetDateTimeString()
+            Dim oFileName = FileEx.GetFilenameWithSuffix(oBaseFileName, "Request", "xml")

            ' Relative Path for Webservice Call
-            Dim oImportRelativeFilePath = IO.Path.Combine(Helpers.GetDateDirectory(oWS.ImportRelativePath), oFileName)
+            Dim oImportRelativeFilePath = IO.Path.Combine(FileEx.GetDateDirectory(oWS.ImportRelativePath), oFileName)

            ' Absolute Path to copy Request file
            Dim oImportAbsolutePath = IO.Path.Combine(oWS.ImportBasePath, oWS.ImportRelativePath)
-            Dim oImportAbsoluteFilePath = IO.Path.Combine(Helpers.GetDateDirectory(oImportAbsolutePath), oFileName)
+            Dim oImportAbsoluteFilePath = IO.Path.Combine(FileEx.GetDateDirectory(oImportAbsolutePath), oFileName)

            ' --- Serialize Data into XML string

@@ -152,7 +155,7 @@ Namespace Winline

        Private Function WriteResponseFile(pPath As String, pBaseFileName As String, pResponseBody As String, pExtension As String)
            Try
-                Dim oRequestFileName As String = Helpers.GetFilenameWithSuffix(pBaseFileName, "Response", pExtension)
+                Dim oRequestFileName As String = FileEx.GetFilenameWithSuffix(pBaseFileName, "Response", pExtension)
                Dim oFilePath As String = IO.Path.Combine(pPath, oRequestFileName)
                IO.File.WriteAllText(oFilePath, pResponseBody)