AppCustom/MultiTool
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Migrate configuration from UserConfig to database

Browse Source
This commit is contained in:
Jonathan Jenne
2021-11-23 11:28:50 +01:00
parent ac50cf661b
commit cdff23b646
11 changed files with 132 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
MultiTool.Form/MyApplication.vb
View File

@@ -6,5 +6,6 @@ Namespace My
Friend Property TemplateConfiguration As TemplateConfig
Friend Property MappingConfiguration As MappingConfig
Friend Property MandatorConfiguration As MandatorConfig
Friend Property GeneralConfiguration As GeneralConfig
End Module
End Namespace

26
MultiTool.Form/frmConfig.vb
View File

@@ -30,29 +30,19 @@ Public Class frmConfig
TBEDI_XML_ITEMSTableAdapter.Connection.ConnectionString = oBuilder.ToString()
TBEDI_XML_ITEMSTableAdapter.Fill(Me.DS_DD_ECM.TBEDI_XML_ITEMS)
txtInputDir.EditValue = Config.InputDirectory
txtOutputDir.EditValue = Config.OutputDirectory
txtSchemaDir.EditValue = Config.SchemaDirectory
txtInputDir.EditValue = My.GeneralConfiguration.InputDirectory
txtOutputDir.EditValue = My.GeneralConfiguration.OutputDirectory
txtSchemaDir.EditValue = My.GeneralConfiguration.TemplateDirectory
txtBaseURL.EditValue = Config.Webservice.BaseUrl
txtUsername.EditValue = Config.Webservice.Username
txtPassword.EditValue = Config.Webservice.Password
txtImportBasePath.EditValue = Config.Webservice.ImportBasePath
txtImportRelativePath.EditValue = Config.Webservice.ImportRelativePath
txtBaseURL.EditValue = My.GeneralConfiguration.Webservice.BaseUrl
txtUsername.EditValue = My.GeneralConfiguration.Webservice.Username
txtPassword.EditValue = My.GeneralConfiguration.Webservice.Password
txtImportBasePath.EditValue = My.GeneralConfiguration.Webservice.ImportBasePath
txtImportRelativePath.EditValue = My.GeneralConfiguration.Webservice.ImportRelativePath
End Sub
Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
Config.Webservice.BaseUrl = txtBaseURL.EditValue
Config.Webservice.Username = txtUsername.EditValue
Config.Webservice.Password = txtPassword.EditValue
Config.Webservice.ImportBasePath = txtImportBasePath.EditValue
Config.Webservice.ImportRelativePath = txtImportRelativePath.EditValue
Config.InputDirectory = txtInputDir.EditValue
Config.OutputDirectory = txtOutputDir.EditValue
Config.SchemaDirectory = txtSchemaDir.EditValue
ConfigManager.Save()
Try
TBEDIXMLITEMSBindingSource.EndEdit()

10
MultiTool.Form/frmImportMain.vb
View File

@@ -76,8 +76,8 @@ Public Class frmImportMain
GridViewFiles.OptionsView.ShowAutoFilterRow = False
FileEx = New DigitalData.Modules.Filesystem.File(LogConfig)
Winline = New WinlineData(LogConfig, Database, ConfigManager.Config, My.MappingConfiguration, My.MandatorConfiguration)
WebService = New WebServiceData(LogConfig, ConfigManager.Config, Application.UserAppDataPath)
Winline = New WinlineData(LogConfig, Database, My.GeneralConfiguration, My.MappingConfiguration, My.MandatorConfiguration)
WebService = New WebServiceData(LogConfig, My.GeneralConfiguration.Webservice, Application.UserAppDataPath)
AddHandler WebService.WebServiceProgress, AddressOf WebService_Progress
Catch ex As Exception
@@ -239,7 +239,7 @@ Public Class frmImportMain
End Sub
If DocumentLoader.LoadFiles(
ConfigManager.Config.InputDirectory,
My.GeneralConfiguration.InputDirectory,
CurrentTemplate,
lookupMandator.EditValue
) Then
@@ -418,7 +418,7 @@ Public Class frmImportMain
End Sub
Private Sub btnOpenInputDirectory_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnOpenInputDirectory.ItemClick
TryOpenDirectory(ConfigManager.Config.InputDirectory, My.Resources.frmImportMainExtra.Eingangsverzeichnis)
TryOpenDirectory(My.GeneralConfiguration.InputDirectory, My.Resources.frmImportMainExtra.Eingangsverzeichnis)
End Sub
Private Sub btnOpenOutputDirectory_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnOpenOutputDirectory.ItemClick
@@ -427,7 +427,7 @@ Public Class frmImportMain
End Sub
Private Sub btnOpenSchemaDirectory_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnOpenSchemaDirectory.ItemClick
TryOpenDirectory(ConfigManager.Config.SchemaDirectory, My.Resources.frmImportMainExtra.Vorlagenverzeichnis)
TryOpenDirectory(My.GeneralConfiguration.TemplateDirectory, My.Resources.frmImportMainExtra.Vorlagenverzeichnis)
End Sub
Private Sub TryOpenDirectory(pPath As String, pDisplayName As String)

4
MultiTool.Form/frmMain.vb
View File

@@ -53,6 +53,7 @@ Public Class frmMain
' Initialize Schemas
TemplateLoader = New TemplateLoader(LogConfig, Database)
Await TemplateLoader.LoadGeneralConfiguration()
Await TemplateLoader.LoadTemplates()
Await TemplateLoader.LoadTemplateConfiguration()
Await TemplateLoader.LoadMappingConfiguration()
@@ -62,6 +63,7 @@ Public Class frmMain
My.MappingConfiguration = TemplateLoader.MappingConfiguration
My.TemplateConfiguration = TemplateLoader.TemplateConfiguration
My.MandatorConfiguration = TemplateLoader.MandatorConfiguration
My.GeneralConfiguration = TemplateLoader.GeneralConfiguration
Dim oBindingSource = New BindingList(Of Template)
For Each oTemplate As Template In TemplateLoader.TemplateList
@@ -84,7 +86,7 @@ Public Class frmMain
Exit Sub
End If
oTemplate = TemplateLoader.UpdateTemplateFromFile(oTemplate, ConfigManager.Config.SchemaDirectory)
oTemplate = TemplateLoader.UpdateTemplateFromFile(oTemplate, My.GeneralConfiguration.TemplateDirectory)
oTemplate = TemplateLoader.UpdateTemplateFromDatabase(oTemplate, TemplateLoader.TemplateConfiguration)
If oTemplate.IsImport Then