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

Fix directory names

Browse Source
This commit is contained in:
Jonathan Jenne 2021-10-29 10:50:48 +02:00
parent 1035a0fb1f
commit 880a345e06
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
MultiTool.Form/frmImportMain.vb
View File

@ -57,14 +57,15 @@ Public Class frmImportMain
Try Try
txtVersion.Caption = String.Format(txtVersion.Caption, Application.ProductVersion) txtVersion.Caption = String.Format(txtVersion.Caption, Application.ProductVersion)
LogConfig = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing, "Digital Data", "EDI Document Importer") LogConfig = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing, Application.CompanyName, Application.ProductName)
Logger = LogConfig.GetLogger() Logger = LogConfig.GetLogger()
Logger.Info("EDI Document Importer, Version [{0}]", Application.ProductVersion) Logger.Info("Starting {0}, Version [{1}]", Application.ProductName, Application.ProductVersion)
ConfigManager = New ConfigManager(Of Config)(LogConfig, ConfigManager = New ConfigManager(Of Config)(LogConfig,
Application.UserAppDataPath, Application.UserAppDataPath,
Application.CommonAppDataPath, Application.CommonAppDataPath,
Application.StartupPath) Application.StartupPath
)
Message = New Message(LogConfig) Message = New Message(LogConfig)
@ -90,7 +91,7 @@ Public Class frmImportMain
Dim oConnectionString = MSSQLServer.DecryptConnectionString(ConfigManager.Config.ConnectionString) Dim oConnectionString = MSSQLServer.DecryptConnectionString(ConfigManager.Config.ConnectionString)
Database = New MSSQLServer(LogConfig, oConnectionString) Database = New MSSQLServer(LogConfig, oConnectionString)
Winline = New Data(LogConfig, Database, ConfigManager.Config) Winline = New Data(LogConfig, Database, ConfigManager.Config)
WebService = New WebService(LogConfig, ConfigManager.Config) WebService = New WebService(LogConfig, ConfigManager.Config, Application.UserAppDataPath)
PositionData = New PositionData(LogConfig, Winline) PositionData = New PositionData(LogConfig, Winline)
Catch ex As Exception Catch ex As Exception
ShowError(ex, "Initialisieren der Anwendungs Daten") ShowError(ex, "Initialisieren der Anwendungs Daten")
@ -370,7 +371,8 @@ Public Class frmImportMain
End Sub End Sub
Private Sub btnOpenOutputDirectory_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnOpenOutputDirectory.ItemClick Private Sub btnOpenOutputDirectory_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnOpenOutputDirectory.ItemClick
Dim oOutputDirectory = IO.Path.Combine(FileEx.GetAppDataPath("Digital Data", "EDI Document Importer"), "WebService") Dim oOutputDirectory = Path.Combine(Application.UserAppDataPath, "WebService")
'Dim oOutputDirectory = IO.Path.Combine(FileEx.GetAppDataPath("Digital Data", "EDI Document Importer"), "WebService")
TryOpenDirectory(oOutputDirectory, "Ausgabeverzeichnis") TryOpenDirectory(oOutputDirectory, "Ausgabeverzeichnis")
End Sub End Sub

2
MultiTool.Form/frmImportMain_old.vb
View File

@ -53,7 +53,7 @@ Public Class frmImportMain_old
Dim oConnectionString = MSSQLServer.DecryptConnectionString(ConfigManager.Config.ConnectionString) Dim oConnectionString = MSSQLServer.DecryptConnectionString(ConfigManager.Config.ConnectionString)
Database = New MSSQLServer(LogConfig, oConnectionString) Database = New MSSQLServer(LogConfig, oConnectionString)
Winline = New Data(LogConfig, Database, ConfigManager.Config) Winline = New Data(LogConfig, Database, ConfigManager.Config)
WebService = New WebService(LogConfig, ConfigManager.Config) WebService = New WebService(LogConfig, ConfigManager.Config, Application.UserAppDataPath)
PositionData = New PositionData(LogConfig, Winline) PositionData = New PositionData(LogConfig, Winline)
' Load WinLine Data ' Load WinLine Data

3
MultiTool.Shared/Winline/Data.vb
View File

@ -157,6 +157,7 @@ Namespace Winline
For Each oMandator As Mandator In pMandators For Each oMandator As Mandator In pMandators
Try Try
' TODO: This is Schaum specific, maybe move to config later
Dim oSQL = $" Dim oSQL = $"
SELECT SELECT
[c030], [c030],
@ -171,7 +172,7 @@ Namespace Winline
Dim oTable As DataTable = Database.GetDatatable(oSQL) Dim oTable As DataTable = Database.GetDatatable(oSQL)
If oTable.Rows.Count = 0 Then If oTable.Rows.Count = 0 Then
Logger.Warn("No DocumentKinds found for Mandator [{0}]", oMandator.Id) Logger.Debug("No DocumentKinds found for Mandator [{0}]", oMandator.Id)
Continue For Continue For
End If End If

6
MultiTool.Shared/Winline/WebService.vb
View File

@ -16,12 +16,14 @@ Namespace Winline
Private ReadOnly Serializer As Serializer Private ReadOnly Serializer As Serializer
Private ReadOnly Mapper As AutoMapper.Mapper Private ReadOnly Mapper As AutoMapper.Mapper
Private ReadOnly FileEx As File Private ReadOnly FileEx As File
Private ReadOnly AppDataPath As String
Public Sub New(pLogConfig As LogConfig, pConfig As Config) Public Sub New(pLogConfig As LogConfig, pConfig As Config, pAppDataPath As String)
MyBase.New(pLogConfig, pLogConfig.GetLogger()) MyBase.New(pLogConfig, pLogConfig.GetLogger())
FileEx = New File(pLogConfig) FileEx = New File(pLogConfig)
Serializer = New Serializer(pLogConfig) Serializer = New Serializer(pLogConfig)
Config = pConfig Config = pConfig
AppDataPath = pAppDataPath
'Mapper = MapperFactory.GetMapper() 'Mapper = MapperFactory.GetMapper()
End Sub End Sub
@ -226,7 +228,7 @@ Namespace Winline
'End Function 'End Function
Private Function GetBaseWebServicePath() As String Private Function GetBaseWebServicePath() As String
Return IO.Path.Combine(FileEx.GetAppDataPath("Digital Data", "EDI Document Importer"), "WebService") Return IO.Path.Combine(AppDataPath, "WebService")
End Function End Function
Private Function GetBaseFilenameForRequest() As String Private Function GetBaseFilenameForRequest() As String