directories per template, export tweaks

MultiTool.Form/frmImportMain.vb

@@ -65,7 +65,7 @@ Public Class frmImportMain
     Private Sub frmImportMain_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Try
             Logger = LogConfig.GetLogger()
-            FormHelper = New FormHelper(LogConfig)
+            FormHelper = New FormHelper(LogConfig, Me)
 
             ' Initialize Database
             Dim oConnectionString = MSSQLServer.DecryptConnectionString(ConfigManager.Config.ConnectionString)
@@ -77,7 +77,7 @@ Public Class frmImportMain
 
             Winline = My.Winline
             FileEx = New DigitalData.Modules.Filesystem.File(LogConfig)
-            WebService = New WebServiceData(LogConfig, My.GeneralConfiguration.Webservice, My.GeneralConfiguration.OutputWebserviceDirectory)
+            WebService = New WebServiceData(LogConfig, My.GeneralConfiguration.Webservice, My.GeneralConfiguration)
             AddHandler WebService.WebServiceProgress, AddressOf WebService_Progress
 
         Catch ex As Exception
@@ -100,7 +100,7 @@ Public Class frmImportMain
             lookupMandator.Properties.View.BestFitColumns()
 
             DocumentLoader = New Documents.DocumentLoader(LogConfig, Winline, My.MappingConfiguration, My.TemplateConfiguration)
-            DocumentCleaner = New Documents.DocumentCleaner(LogConfig, My.GeneralConfiguration)
+            DocumentCleaner = New Documents.DocumentCleaner(LogConfig, CurrentTemplate)
 
             GridLoader = New GridLoader(LogConfig)
             ReportGenerator = New ReportGenerator(Of OrderReport)(LogConfig, Database, My.TemplateConfiguration, My.GeneralConfiguration)
@@ -235,11 +235,7 @@ Public Class frmImportMain
                                                             SplashScreenManager.SetWaitFormDescription(oMessage)
                                                         End Sub
 
-            If DocumentLoader.LoadFiles(
-                My.GeneralConfiguration.InputDirectory,
-                CurrentTemplate,
-                lookupMandator.EditValue
-            ) Then
+            If DocumentLoader.LoadFiles(CurrentTemplate, lookupMandator.EditValue) Then
                 GridControlFiles.DataSource = Nothing
                 GridControlFiles.DataSource = DocumentLoader.Files
 
@@ -414,13 +410,13 @@ Public Class frmImportMain
             End If
 
             ' Transfer to winline
-            Await WebService.TransferDocumentToWinline(oDocument, lookupMandator.EditValue)
+            Await WebService.TransferDocumentToWinline(oDocument, CurrentTemplate, lookupMandator.EditValue)
 
             WebService.RaiseWebServiceProgress("Bericht erzeugen")
 
             ' Generate the report
             Dim oReport = ReportGenerator.GenerateReport(oDocument)
-            Dim oFilePath = ReportGenerator.GetReportFilePath(oDocument)
+            Dim oFilePath = ReportGenerator.GetReportFilePath(oDocument, CurrentTemplate)
 
             WebService.RaiseWebServiceProgress("Bericht exportieren")
 
@@ -451,15 +447,15 @@ Public Class frmImportMain
     End Sub
 
     Private Sub btnOpenInputDirectory_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnOpenInputDirectory.ItemClick
-        TryOpenDirectory(My.GeneralConfiguration.InputDirectory, My.Resources.frmImportMainExtra.Eingangsverzeichnis)
+        FormHelper.TryOpenDirectory(CurrentTemplate.InputDirectory, My.Resources.frmImportMainExtra.Eingangsverzeichnis)
     End Sub
 
     Private Sub btnOpenOutputDirectory_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnOpenOutputDirectory.ItemClick
-        TryOpenDirectory(My.GeneralConfiguration.OutputDirectory, My.Resources.frmImportMainExtra.Ausgabeverzeichnis)
+        FormHelper.TryOpenDirectory(CurrentTemplate.OutputDirectory, My.Resources.frmImportMainExtra.Ausgabeverzeichnis)
     End Sub
 
     Private Sub btnOpenSchemaDirectory_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnOpenSchemaDirectory.ItemClick
-        TryOpenDirectory(My.GeneralConfiguration.TemplateDirectory, My.Resources.frmImportMainExtra.Vorlagenverzeichnis)
+        FormHelper.TryOpenDirectory(My.GeneralConfiguration.TemplateDirectory, My.Resources.frmImportMainExtra.Vorlagenverzeichnis)
     End Sub
 
     Private Sub TryOpenDirectory(pPath As String, pDisplayName As String)
@@ -603,7 +599,7 @@ Public Class frmImportMain
             SplitContainerGrids.Enabled = False
 
             Dim oDocument As Document = GridViewFiles.GetRow(GridViewFiles.FocusedRowHandle)
-            Await WebService.TransferDocumentToWinline(oDocument, lookupMandator.EditValue, pIsTest:=True)
+            Await WebService.TransferDocumentToWinline(oDocument, CurrentTemplate, lookupMandator.EditValue, pIsTest:=True)
 
             MsgBox(My.Resources.frmImportMainExtra.Datei_erfolgreich_in_die_WinLine_übertragen, MsgBoxStyle.Information, Text)
         Catch ex As HttpRequestException