diff --git a/MultiTool.Form/MultiTool.Form.vbproj b/MultiTool.Form/MultiTool.Form.vbproj index e9db2e2..7cff93d 100644 --- a/MultiTool.Form/MultiTool.Form.vbproj +++ b/MultiTool.Form/MultiTool.Form.vbproj @@ -188,6 +188,11 @@ Component + + True + True + frmMainExtra.resx + True True @@ -255,6 +260,11 @@ OrderReport.vb + + My.Resources + ResXFileCodeGenerator + frmMainExtra.Designer.vb + My.Resources ResXFileCodeGenerator @@ -315,6 +325,12 @@ + + + + + + diff --git a/MultiTool.Form/My Project/Resources.Designer.vb b/MultiTool.Form/My Project/Resources.Designer.vb index 95bf422..be3f697 100644 --- a/MultiTool.Form/My Project/Resources.Designer.vb +++ b/MultiTool.Form/My Project/Resources.Designer.vb @@ -110,6 +110,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property actions_reload() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("actions_reload", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -180,6 +190,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property bo_unknown2() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("bo_unknown2", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -190,6 +210,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property charthorizontalaxis_logscale() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("charthorizontalaxis_logscale", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -260,6 +290,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property logical1() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("logical1", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -320,6 +360,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property open23() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("open23", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -420,6 +470,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property squarified() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("squarified", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' diff --git a/MultiTool.Form/My Project/Resources.resx b/MultiTool.Form/My Project/Resources.resx index bf6028f..48cac91 100644 --- a/MultiTool.Form/My Project/Resources.resx +++ b/MultiTool.Form/My Project/Resources.resx @@ -124,6 +124,9 @@ ..\Resources\bo_country.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\logical1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\redo.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -157,6 +160,9 @@ ..\Resources\togglefieldcodes.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_reload.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\open21.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -172,6 +178,12 @@ ..\Resources\bo_unknown.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\charthorizontalaxis_logscale.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\actions_arrow4down.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\deletetablerows.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -202,8 +214,8 @@ ..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_arrow4down.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_checkcircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -214,6 +226,9 @@ ..\Resources\followupall.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\bo_unknown2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\actions_send.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -226,6 +241,9 @@ ..\Resources\import.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\open23.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\pagesetup.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -238,7 +256,7 @@ ..\Resources\itemtypechecked.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_checkcircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\squarified.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/MultiTool.Form/Resources/actions_reload.svg b/MultiTool.Form/Resources/actions_reload.svg new file mode 100644 index 0000000..b6b1422 --- /dev/null +++ b/MultiTool.Form/Resources/actions_reload.svg @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/MultiTool.Form/Resources/bo_unknown2.svg b/MultiTool.Form/Resources/bo_unknown2.svg new file mode 100644 index 0000000..4306bf7 --- /dev/null +++ b/MultiTool.Form/Resources/bo_unknown2.svg @@ -0,0 +1,12 @@ + + + + + + + + + \ No newline at end of file diff --git a/MultiTool.Form/Resources/charthorizontalaxis_logscale.svg b/MultiTool.Form/Resources/charthorizontalaxis_logscale.svg new file mode 100644 index 0000000..372d2c0 --- /dev/null +++ b/MultiTool.Form/Resources/charthorizontalaxis_logscale.svg @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/MultiTool.Form/Resources/logical1.svg b/MultiTool.Form/Resources/logical1.svg new file mode 100644 index 0000000..77a949b --- /dev/null +++ b/MultiTool.Form/Resources/logical1.svg @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/MultiTool.Form/Resources/open23.svg b/MultiTool.Form/Resources/open23.svg new file mode 100644 index 0000000..04ab349 --- /dev/null +++ b/MultiTool.Form/Resources/open23.svg @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/MultiTool.Form/Resources/squarified.svg b/MultiTool.Form/Resources/squarified.svg new file mode 100644 index 0000000..c6b6e11 --- /dev/null +++ b/MultiTool.Form/Resources/squarified.svg @@ -0,0 +1,19 @@ + + + + + + + + + + \ No newline at end of file diff --git a/MultiTool.Form/Strings/frmMainExtra.Designer.vb b/MultiTool.Form/Strings/frmMainExtra.Designer.vb new file mode 100644 index 0000000..30b6a70 --- /dev/null +++ b/MultiTool.Form/Strings/frmMainExtra.Designer.vb @@ -0,0 +1,76 @@ +'------------------------------------------------------------------------------ +' +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 +' +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + +Imports System + +Namespace My.Resources + + 'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert + '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. + 'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen + 'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. + ''' + ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. + ''' + _ + Friend Class frmMainExtra + + Private Shared resourceMan As Global.System.Resources.ResourceManager + + Private Shared resourceCulture As Global.System.Globalization.CultureInfo + + _ + Friend Sub New() + MyBase.New + End Sub + + ''' + ''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. + ''' + _ + Friend Shared ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager + Get + If Object.ReferenceEquals(resourceMan, Nothing) Then + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("MultiTool.Form.frmMainExtra", GetType(frmMainExtra).Assembly) + resourceMan = temp + End If + Return resourceMan + End Get + End Property + + ''' + ''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + ''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. + ''' + _ + Friend Shared Property Culture() As Global.System.Globalization.CultureInfo + Get + Return resourceCulture + End Get + Set + resourceCulture = value + End Set + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Laden der Vorlage ähnelt. + ''' + Friend Shared ReadOnly Property Laden_der_Vorlage() As String + Get + Return ResourceManager.GetString("Laden der Vorlage", resourceCulture) + End Get + End Property + End Class +End Namespace diff --git a/MultiTool.Form/Strings/frmMainExtra.resx b/MultiTool.Form/Strings/frmMainExtra.resx new file mode 100644 index 0000000..5f862a8 --- /dev/null +++ b/MultiTool.Form/Strings/frmMainExtra.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Laden der Vorlage + + \ No newline at end of file diff --git a/MultiTool.Form/Strings/frmShared.Designer.vb b/MultiTool.Form/Strings/frmShared.Designer.vb index e539f01..f311b99 100644 --- a/MultiTool.Form/Strings/frmShared.Designer.vb +++ b/MultiTool.Form/Strings/frmShared.Designer.vb @@ -90,5 +90,14 @@ Namespace My.Resources Return ResourceManager.GetString("In der Funktion '{0}' ist folgender Fehler aufgetreten: {1}", resourceCulture) End Get End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Laden des Formulars ähnelt. + ''' + Friend Shared ReadOnly Property Laden_des_Formulars() As String + Get + Return ResourceManager.GetString("Laden des Formulars", resourceCulture) + End Get + End Property End Class End Namespace diff --git a/MultiTool.Form/Strings/frmShared.resx b/MultiTool.Form/Strings/frmShared.resx index fcb56b7..d71c7b0 100644 --- a/MultiTool.Form/Strings/frmShared.resx +++ b/MultiTool.Form/Strings/frmShared.resx @@ -123,6 +123,9 @@ In der Funktion '{0}' ist folgender Fehler aufgetreten: {1} + + Laden des Formulars + {0} - WebService Multitool für WinLine diff --git a/MultiTool.Form/frmImportMain.Designer.vb b/MultiTool.Form/frmImportMain.Designer.vb index a978a39..92ccb1d 100644 --- a/MultiTool.Form/frmImportMain.Designer.vb +++ b/MultiTool.Form/frmImportMain.Designer.vb @@ -63,8 +63,6 @@ Partial Class frmImportMain Me.RibbonPageGroup7 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup5 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageGroup6 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RepositoryItemComboBox1 = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox() Me.RepositoryItemProgressBar1 = New DevExpress.XtraEditors.Repository.RepositoryItemProgressBar() Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() @@ -402,7 +400,7 @@ Partial Class frmImportMain ' 'RibbonPage2 ' - Me.RibbonPage2.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup5, Me.RibbonPageGroup2, Me.RibbonPageGroup6}) + Me.RibbonPage2.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup5}) Me.RibbonPage2.Name = "RibbonPage2" resources.ApplyResources(Me.RibbonPage2, "RibbonPage2") ' @@ -414,20 +412,6 @@ Partial Class frmImportMain Me.RibbonPageGroup5.Name = "RibbonPageGroup5" resources.ApplyResources(Me.RibbonPageGroup5, "RibbonPageGroup5") ' - 'RibbonPageGroup2 - ' - Me.RibbonPageGroup2.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far - Me.RibbonPageGroup2.ItemLinks.Add(Me.btnOpenLogDirectory) - Me.RibbonPageGroup2.ItemLinks.Add(Me.btnOpenConfigDirectory) - Me.RibbonPageGroup2.Name = "RibbonPageGroup2" - resources.ApplyResources(Me.RibbonPageGroup2, "RibbonPageGroup2") - ' - 'RibbonPageGroup6 - ' - Me.RibbonPageGroup6.ItemLinks.Add(Me.btnConfig) - Me.RibbonPageGroup6.Name = "RibbonPageGroup6" - resources.ApplyResources(Me.RibbonPageGroup6, "RibbonPageGroup6") - ' 'RepositoryItemComboBox1 ' resources.ApplyResources(Me.RepositoryItemComboBox1, "RepositoryItemComboBox1") @@ -636,7 +620,6 @@ Partial Class frmImportMain Friend WithEvents btnTransferFile As DevExpress.XtraBars.BarButtonItem Friend WithEvents btnOpenInputDirectory As DevExpress.XtraBars.BarButtonItem Friend WithEvents btnOpenOutputDirectory As DevExpress.XtraBars.BarButtonItem - Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents btnOpenSchemaDirectory As DevExpress.XtraBars.BarButtonItem Friend WithEvents SplitContainerMain As DevExpress.XtraEditors.SplitContainerControl Friend WithEvents btnReloadFile As DevExpress.XtraBars.BarButtonItem @@ -665,7 +648,6 @@ Partial Class frmImportMain Friend WithEvents BehaviorManager As DevExpress.Utils.Behaviors.BehaviorManager Friend WithEvents txtCurrentFile As DevExpress.XtraBars.BarStaticItem Friend WithEvents btnConfig As DevExpress.XtraBars.BarButtonItem - Friend WithEvents RibbonPageGroup6 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RepositoryItemProgressBar1 As Repository.RepositoryItemProgressBar Friend WithEvents SplashScreenManager As DevExpress.XtraSplashScreen.SplashScreenManager Friend WithEvents txtCulture As DevExpress.XtraBars.BarStaticItem diff --git a/MultiTool.Form/frmImportMain.resx b/MultiTool.Form/frmImportMain.resx index 4e750d6..e14f301 100644 --- a/MultiTool.Form/frmImportMain.resx +++ b/MultiTool.Form/frmImportMain.resx @@ -509,18 +509,6 @@ DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageGroup2 - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RibbonPageGroup6 - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - RepositoryItemComboBox1 @@ -614,12 +602,6 @@ Verzeichnisse - - Debugging - - - Konfiguration - Erweitert diff --git a/MultiTool.Form/frmImportMain.vb b/MultiTool.Form/frmImportMain.vb index b8e0cab..7d8c151 100644 --- a/MultiTool.Form/frmImportMain.vb +++ b/MultiTool.Form/frmImportMain.vb @@ -448,15 +448,6 @@ Public Class frmImportMain End If End Sub - Private Sub btnOpenLogDirectory_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnOpenLogDirectory.ItemClick - TryOpenDirectory(LogConfig.LogDirectory, My.Resources.frmImportMainExtra.Logverzeichnis) - End Sub - - Private Sub btnOpenConfigDirectory_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnOpenConfigDirectory.ItemClick - Dim oUserConfigDirectory = New FileInfo(ConfigManager.UserConfigPath).Directory - TryOpenDirectory(oUserConfigDirectory.FullName, My.Resources.frmImportMainExtra.Konfigurationsverzeichnis) - End Sub - Private Sub btnShowXml_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnShowXml.ItemClick Dim oForm As New frmXmlEditor With {.FileName = CurrentDocument.FullName} oForm.Show() @@ -468,14 +459,6 @@ Public Class frmImportMain End If End Sub - Private Sub btnConfig_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnConfig.ItemClick - Dim oForm As New frmConfig(LogConfig) With { - .ConfigManager = ConfigManager - } - - oForm.ShowDialog() - End Sub - Private Sub btnRemoveRow_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnRemoveRow.ItemClick If CurrentGrid Is Nothing Then Exit Sub diff --git a/MultiTool.Form/frmMain.Designer.vb b/MultiTool.Form/frmMain.Designer.vb index 258bc25..0b3367d 100644 --- a/MultiTool.Form/frmMain.Designer.vb +++ b/MultiTool.Form/frmMain.Designer.vb @@ -21,9 +21,16 @@ Partial Class frmMain Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.btnOpenImportExportForm = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPage3 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.SvgImageCollection1 = New DevExpress.Utils.SvgImageCollection(Me.components) @@ -40,33 +47,86 @@ Partial Class frmMain ' 'RibbonControl1 ' + Me.RibbonControl1.CommandLayout = DevExpress.XtraBars.Ribbon.CommandLayout.Simplified Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.btnOpenImportExportForm, Me.BarButtonItem1, Me.BarButtonItem4, Me.BarButtonItem2, Me.BarButtonItem3}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 2 + Me.RibbonControl1.MaxItemId = 8 Me.RibbonControl1.Name = "RibbonControl1" - Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) - Me.RibbonControl1.Size = New System.Drawing.Size(757, 158) + Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage3}) + Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] + Me.RibbonControl1.ShowToolbarCustomizeItem = False + Me.RibbonControl1.Size = New System.Drawing.Size(757, 89) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 + Me.RibbonControl1.Toolbar.ShowCustomizeItem = False + ' + 'btnOpenImportExportForm + ' + Me.btnOpenImportExportForm.Caption = "Vorlage öffnen" + Me.btnOpenImportExportForm.Id = 1 + Me.btnOpenImportExportForm.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_checkcircled1 + Me.btnOpenImportExportForm.Name = "btnOpenImportExportForm" ' 'BarButtonItem1 ' - Me.BarButtonItem1.Caption = "Vorlage verwenden" - Me.BarButtonItem1.Id = 1 - Me.BarButtonItem1.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_checkcircled1 + Me.BarButtonItem1.Caption = "Vorlagen laden" + Me.BarButtonItem1.Id = 2 + Me.BarButtonItem1.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_reload Me.BarButtonItem1.Name = "BarButtonItem1" ' + 'BarButtonItem4 + ' + Me.BarButtonItem4.Caption = "Konfiguration öffnen" + Me.BarButtonItem4.Id = 5 + Me.BarButtonItem4.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.bo_unknown2 + Me.BarButtonItem4.Name = "BarButtonItem4" + ' + 'BarButtonItem2 + ' + Me.BarButtonItem2.Caption = "Konfigurationsverzeichnis öffnen" + Me.BarButtonItem2.Id = 6 + Me.BarButtonItem2.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.open23 + Me.BarButtonItem2.Name = "BarButtonItem2" + ' + 'BarButtonItem3 + ' + Me.BarButtonItem3.Caption = "Logverzeichnis öffnen" + Me.BarButtonItem3.Id = 7 + Me.BarButtonItem3.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.logical1 + Me.BarButtonItem3.Name = "BarButtonItem3" + ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup3}) Me.RibbonPage1.Name = "RibbonPage1" - Me.RibbonPage1.Text = "RibbonPage1" + Me.RibbonPage1.Text = "Start" ' 'RibbonPageGroup1 ' Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" - Me.RibbonPageGroup1.Text = "RibbonPageGroup1" + Me.RibbonPageGroup1.Text = "Start" + ' + 'RibbonPageGroup3 + ' + Me.RibbonPageGroup3.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far + Me.RibbonPageGroup3.ItemLinks.Add(Me.btnOpenImportExportForm) + Me.RibbonPageGroup3.Name = "RibbonPageGroup3" + Me.RibbonPageGroup3.Text = "RibbonPageGroup3" + ' + 'RibbonPage3 + ' + Me.RibbonPage3.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2}) + Me.RibbonPage3.Name = "RibbonPage3" + Me.RibbonPage3.Text = "Erweitert" + ' + 'RibbonPageGroup2 + ' + Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem4) + Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem2) + Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem3) + Me.RibbonPageGroup2.Name = "RibbonPageGroup2" + Me.RibbonPageGroup2.Text = "RibbonPageGroup2" ' 'RibbonStatusBar1 ' @@ -88,19 +148,19 @@ Partial Class frmMain 'GridControl1 ' Me.GridControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.GridControl1.Location = New System.Drawing.Point(0, 158) + Me.GridControl1.Location = New System.Drawing.Point(0, 89) Me.GridControl1.MainView = Me.GridViewTemplates Me.GridControl1.MenuManager = Me.RibbonControl1 Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(757, 355) + Me.GridControl1.Size = New System.Drawing.Size(757, 424) Me.GridControl1.TabIndex = 9 Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewTemplates}) ' - 'GridView1 + 'GridViewTemplates ' Me.GridViewTemplates.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colName, Me.colDescription, Me.colFileName}) Me.GridViewTemplates.GridControl = Me.GridControl1 - Me.GridViewTemplates.Name = "GridView1" + Me.GridViewTemplates.Name = "GridViewTemplates" ' 'colName ' @@ -134,6 +194,7 @@ Partial Class frmMain Me.Controls.Add(Me.GridControl1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) + Me.IconOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.squarified Me.Name = "frmMain" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 @@ -151,11 +212,18 @@ Partial Class frmMain Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage - Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents btnOpenImportExportForm As DevExpress.XtraBars.BarButtonItem Friend WithEvents SvgImageCollection1 As DevExpress.Utils.SvgImageCollection Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl Friend WithEvents GridViewTemplates As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents colName As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colDescription As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colFileName As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents RibbonPage3 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup End Class diff --git a/MultiTool.Form/frmMain.vb b/MultiTool.Form/frmMain.vb index bc6d120..8b62ae7 100644 --- a/MultiTool.Form/frmMain.vb +++ b/MultiTool.Form/frmMain.vb @@ -14,70 +14,113 @@ Public Class frmMain Private Database As MSSQLServer Private SchemaLoader As SchemaLoader Private GridBuilder As GridBuilder + Private FormHelper As FormHelper Private Async Sub frmMain_Load(sender As Object, e As EventArgs) Handles MyBase.Load - LogConfig = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing, Application.CompanyName, Application.ProductName) - Logger = LogConfig.GetLogger() - Logger.Info("Starting {0}, Version [{1}]", Application.ProductName, Application.ProductVersion) + Try + Text = String.Format(My.Resources.frmShared._0____WebService_Multitool_für_WinLine, My.Resources.frmShared.Auswahl_der_Vorlage) - Text = String.Format(My.Resources.frmShared._0____WebService_Multitool_für_WinLine, My.Resources.frmShared.Auswahl_der_Vorlage) + LogConfig = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing, Application.CompanyName, Application.ProductName) + Logger = LogConfig.GetLogger() + Logger.Info("Starting {0}, Version [{1}]", Application.ProductName, Application.ProductVersion) + FormHelper = New FormHelper(LogConfig) + ConfigManager = New ConfigManager(Of [Shared].Config)(LogConfig, + Application.UserAppDataPath, + Application.CommonAppDataPath, + Application.StartupPath + ) - ConfigManager = New ConfigManager(Of [Shared].Config)(LogConfig, - Application.UserAppDataPath, - Application.CommonAppDataPath, - Application.StartupPath - ) + GridBuilder = New GridBuilder(GridViewTemplates) + GridBuilder.WithDefaults.WithReadOnlyOptions.WithClipboardHandler() + GridViewTemplates.OptionsView.ShowAutoFilterRow = False - GridBuilder = New GridBuilder(GridViewTemplates) - GridBuilder.WithDefaults.WithReadOnlyOptions.WithClipboardHandler() - GridViewTemplates.OptionsView.ShowAutoFilterRow = False + ' If ConnectionString does not exist, show SQL Config Form + If ConfigManager.Config.ConnectionString = String.Empty Then + Dim oForm As New frmSQLConfig(LogConfig) With { + .FormTitle = Application.ProductName + } + Dim oResult = oForm.ShowDialog() - ' If ConnectionString does not exist, show SQL Config Form - If ConfigManager.Config.ConnectionString = String.Empty Then - Dim oForm As New frmSQLConfig(LogConfig) With { - .FormTitle = Application.ProductName - } - Dim oResult = oForm.ShowDialog() - - If oResult = DialogResult.OK Then - ConfigManager.Config.ConnectionString = oForm.ConnectionString - ConfigManager.Save() + If oResult = DialogResult.OK Then + ConfigManager.Config.ConnectionString = oForm.ConnectionString + ConfigManager.Save() + End If End If - End If - ' Initialize Database - Dim oConnectionString = MSSQLServer.DecryptConnectionString(ConfigManager.Config.ConnectionString) - Database = New MSSQLServer(LogConfig, oConnectionString) + ' Initialize Database + Dim oConnectionString = MSSQLServer.DecryptConnectionString(ConfigManager.Config.ConnectionString) + Database = New MSSQLServer(LogConfig, oConnectionString) - ' Initialize Schemas - SchemaLoader = New SchemaLoader(LogConfig, Database, ConfigManager.Config.SchemaDirectory) - Await SchemaLoader.LoadTemplates() - Await SchemaLoader.LoadTemplateConfiguration() + ' Initialize Schemas + SchemaLoader = New SchemaLoader(LogConfig, Database) + Await SchemaLoader.LoadTemplates() + Await SchemaLoader.LoadTemplateConfiguration() - Dim oBindingSource = New BindingList(Of Schema) - For Each oSchema As Schema In SchemaLoader.SchemaList - oBindingSource.Add(oSchema) - Next + Dim oBindingSource = New BindingList(Of Schema) + For Each oSchema As Schema In SchemaLoader.SchemaList + oBindingSource.Add(oSchema) + Next - GridControl1.DataSource = oBindingSource + GridControl1.DataSource = oBindingSource + Catch ex As Exception + FormHelper.ShowError(ex, My.Resources.frmShared.Laden_des_Formulars) + + End Try End Sub - Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick - Dim oSchema = GridViewTemplates.GetRow(GridViewTemplates.FocusedRowHandle) + Private Sub btnOpenImportExportForm_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnOpenImportExportForm.ItemClick + Try + Dim oSchema = GridViewTemplates.GetRow(GridViewTemplates.FocusedRowHandle) - If oSchema Is Nothing Then - MsgBox("Keine Vorlage ausgewählt! Bitte wählen Sie eine Vorlage aus!", MsgBoxStyle.Exclamation, Text) - Exit Sub + If oSchema Is Nothing Then + MsgBox("Keine Vorlage ausgewählt! Bitte wählen Sie eine Vorlage aus!", MsgBoxStyle.Exclamation, Text) + Exit Sub + End If + + oSchema = SchemaLoader.UpdateSchemaFromFile(oSchema, ConfigManager.Config.SchemaDirectory) + oSchema = SchemaLoader.UpdateSchemaFromDatabase(oSchema, SchemaLoader.TemplateConfiguration) + + Dim oForm As New frmImportMain(LogConfig, ConfigManager, oSchema) + oForm.ShowDialog() + + Catch ex As Exception + FormHelper.ShowError(ex, My.Resources.frmMainExtra.Laden_der_Vorlage) + + End Try + End Sub + + Private Sub TryOpenDirectory(pPath As String, pDisplayName As String) + If Directory.Exists(pPath) Then + Process.Start(pPath) + Else + Dim oMessage = String.Format(My.Resources.frmImportMainExtra._0__nicht_konfiguriert_oder_nicht_gefunden, pDisplayName) + MsgBox(oMessage, MsgBoxStyle.Exclamation, Text) End If + End Sub - oSchema = SchemaLoader.UpdateSchemaFromFile(oSchema, ConfigManager.Config.SchemaDirectory) - oSchema = SchemaLoader.UpdateSchemaFromDatabase(oSchema, SchemaLoader.TemplateConfiguration) + Private Sub TryOpenFile(pPath As String, pDisplayName As String) + If File.Exists(pPath) Then + Process.Start(pPath) + Else + Dim oMessage = String.Format(My.Resources.frmImportMainExtra._0__nicht_konfiguriert_oder_nicht_gefunden, pDisplayName) + MsgBox(oMessage, MsgBoxStyle.Exclamation, Text) + End If + End Sub + + Private Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem4.ItemClick + Dim oForm As New frmConfig(LogConfig) With { + .ConfigManager = ConfigManager + } - Dim oForm As New frmImportMain(LogConfig, ConfigManager, oSchema) oForm.ShowDialog() End Sub - Private Sub RibbonControl1_Click(sender As Object, e As EventArgs) Handles RibbonControl1.Click + Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick + Dim oUserConfigDirectory = New FileInfo(ConfigManager.UserConfigPath).Directory + TryOpenDirectory(oUserConfigDirectory.FullName, My.Resources.frmImportMainExtra.Konfigurationsverzeichnis) + End Sub + Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick + TryOpenDirectory(LogConfig.LogDirectory, My.Resources.frmImportMainExtra.Logverzeichnis) End Sub End Class \ No newline at end of file diff --git a/MultiTool.Form/frmRowEditor.vb b/MultiTool.Form/frmRowEditor.vb index b773d91..781fc56 100644 --- a/MultiTool.Form/frmRowEditor.vb +++ b/MultiTool.Form/frmRowEditor.vb @@ -12,7 +12,6 @@ Imports DevExpress.XtraEditors.Controls Imports DevExpress.XtraGrid.Views.Grid Public Class frmRowEditor - Private ReadOnly LogConfig As LogConfig Private ReadOnly Logger As Logger Private ReadOnly FormHelper As FormHelper @@ -44,7 +43,6 @@ Public Class frmRowEditor Public Sub New(pLogConfig As LogConfig, pColumns As List(Of String), pDocumentRow As DocumentRow, pMandator As Mandator, pWinline As WinlineData, pTable As Schema.Table) InitializeComponent() - LogConfig = pLogConfig Logger = pLogConfig.GetLogger() FormHelper = New FormHelper(pLogConfig) @@ -95,41 +93,46 @@ Public Class frmRowEditor End Sub Private Sub frmRowEditor_Load(sender As Object, e As EventArgs) Handles Me.Load - Dim oDict = New Dictionary(Of String, FieldValue) + Try + Dim oDict = New Dictionary(Of String, FieldValue) - For Each oColumnName As String In _Columns - Dim oField = _DocumentRow.Fields. - Where(Function(f) f.Key = oColumnName). - SingleOrDefault() + For Each oColumnName As String In _Columns + Dim oField = _DocumentRow.Fields. + Where(Function(f) f.Key = oColumnName). + SingleOrDefault() - Dim oColumn = _Table.Columns. - Where(Function(c) c.Name = oColumnName). - SingleOrDefault() + Dim oColumn = _Table.Columns. + Where(Function(c) c.Name = oColumnName). + SingleOrDefault() - ' Only Show Columns that are set to visible - If oColumn?.Config?.IsVisible = False Then - Continue For - End If + ' Only Show Columns that are set to visible + If oColumn?.Config?.IsVisible = False Then + Continue For + End If - If oField.Value Is Nothing Then - oDict.Add(oColumnName, New FieldValue()) - Else - oDict.Add(oColumnName, oField.Value) - End If + If oField.Value Is Nothing Then + oDict.Add(oColumnName, New FieldValue()) + Else + oDict.Add(oColumnName, oField.Value) + End If - Next + Next - _DataTable.Columns.Clear() - _DataTable.Columns.Add(COL_KEY) - _DataTable.Columns.Add(COL_VALUE_ORIGINAL) - _DataTable.Columns.Add(COL_VALUE_EXTERNAL) - _DataTable.Columns.Add(COL_VALUE_FINAL) + _DataTable.Columns.Clear() + _DataTable.Columns.Add(COL_KEY) + _DataTable.Columns.Add(COL_VALUE_ORIGINAL) + _DataTable.Columns.Add(COL_VALUE_EXTERNAL) + _DataTable.Columns.Add(COL_VALUE_FINAL) - For Each oKV In oDict - _DataTable.Rows.Add(oKV.Key, oKV.Value.Original, oKV.Value.External, oKV.Value.Final) - Next + For Each oKV In oDict + _DataTable.Rows.Add(oKV.Key, oKV.Value.Original, oKV.Value.External, oKV.Value.Final) + Next - GridControl1.DataSource = _DataTable + GridControl1.DataSource = _DataTable + Catch ex As Exception + FormHelper.ShowError(ex, My.Resources.frmShared.Laden_des_Formulars) + + End Try End Sub Private Sub btnSave_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnSave.ItemClick diff --git a/MultiTool.Shared/Documents/DocumentLoader.vb b/MultiTool.Shared/Documents/DocumentLoader.vb index e0ed847..2c9475a 100644 --- a/MultiTool.Shared/Documents/DocumentLoader.vb +++ b/MultiTool.Shared/Documents/DocumentLoader.vb @@ -375,15 +375,6 @@ Namespace Documents End If End Sub - Private Function TryGetDictionaryItem(Of T)(pDictionary As IDictionary(Of String, T), pKey As String) As T - If pDictionary.ContainsKey(pKey) Then - Return pDictionary.Item(pKey) - Else - Return Nothing - End If - End Function - - Private Function WrapFileInfo(pFileInfo As FileInfo) As Document Return New Document With {.File = pFileInfo} End Function diff --git a/MultiTool.Shared/Helpers.vb b/MultiTool.Shared/Helpers.vb index cf05499..7ad7e6b 100644 --- a/MultiTool.Shared/Helpers.vb +++ b/MultiTool.Shared/Helpers.vb @@ -8,4 +8,12 @@ Public Class Helpers Return Nothing End Try End Function + + Private Function TryGetDictionaryItem(Of T)(pDictionary As IDictionary(Of String, T), pKey As String) As T + If pDictionary.ContainsKey(pKey) Then + Return pDictionary.Item(pKey) + Else + Return Nothing + End If + End Function End Class diff --git a/MultiTool.Shared/Schemas/SchemaLoader.vb b/MultiTool.Shared/Schemas/SchemaLoader.vb index 976c52d..1bd3564 100644 --- a/MultiTool.Shared/Schemas/SchemaLoader.vb +++ b/MultiTool.Shared/Schemas/SchemaLoader.vb @@ -13,15 +13,13 @@ Namespace Schemas Public SchemaList As List(Of Schema) Public TemplateConfiguration As New Configuration - Private Database As MSSQLServer - Private InputDirectory As String + Private ReadOnly Database As MSSQLServer Private Const VWEDI_XML_ITEMS = "VWEDI_XML_ITEMS" - Public Sub New(pLogConfig As LogConfig, pMSSQL As MSSQLServer, pInputDirectory As String) + Public Sub New(pLogConfig As LogConfig, pMSSQL As MSSQLServer) MyBase.New(pLogConfig, pLogConfig.GetLogger) Database = pMSSQL - InputDirectory = pInputDirectory End Sub Public Async Function LoadTemplates() As Task(Of Boolean) diff --git a/MultiTool.Shared/Winline/WebService.vb b/MultiTool.Shared/Winline/WebService.vb index c7b56a5..919b640 100644 --- a/MultiTool.Shared/Winline/WebService.vb +++ b/MultiTool.Shared/Winline/WebService.vb @@ -77,7 +77,7 @@ Namespace Winline ' 1 = As File (relative to Winline Server directory) Dim oByref = 1 - Dim oURL As String = $"{oWS.BaseUrl}/ewlservice/import?User={oWS.Username}&Password={oWS.Password}&Company={pDocument.Mandator.Id}&Type={oTemplateType}&Vorlage={oTemplateName}&ActionCode={oActionCode}&Byref={oByref}&Data={oImportRelativeFilePath}" + Dim oURL As String = $"{oWS.BaseUrl}/ewlservice/import?User={oWS.Username}&Password={oWS.Password}&Company={pMandator.Id}&Type={oTemplateType}&Vorlage={oTemplateName}&ActionCode={oActionCode}&Byref={oByref}&Data={oImportRelativeFilePath}" Dim oClient As New HttpClient() Logger.Info("Creating HTTP Request to [{0}]", oWS.BaseUrl)