diff --git a/MultiTool.Form/MultiTool.Form.vbproj b/MultiTool.Form/MultiTool.Form.vbproj index 6f01ae2..d0c09d0 100644 --- a/MultiTool.Form/MultiTool.Form.vbproj +++ b/MultiTool.Form/MultiTool.Form.vbproj @@ -70,31 +70,25 @@ False - False - False - False - False - False - @@ -338,6 +332,7 @@ + diff --git a/MultiTool.Form/MultiTool.Form.vbproj.bak b/MultiTool.Form/MultiTool.Form.vbproj.bak deleted file mode 100644 index b90fe53..0000000 --- a/MultiTool.Form/MultiTool.Form.vbproj.bak +++ /dev/null @@ -1,399 +0,0 @@ - - - - - Debug - AnyCPU - {7AAEC958-955D-4F77-964C-38658684E424} - WinExe - MultiTool.Form.My.MyApplication - MultiTool.Form - MultiTool.Form - 512 - WindowsForms - v4.6.1 - true - true - - - AnyCPU - true - full - true - true - bin\Debug\ - MultiTool.Form.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - AnyCPU - pdbonly - false - true - true - bin\Release\ - MultiTool.Form.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - On - - - Binary - - - Off - - - On - - - MultiTool.ico - - - My Project\app.manifest - - - - ..\packages\AutoMapper.10.1.1\lib\net461\AutoMapper.dll - - - - - - - - - - - - - - False - D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.Utils.v19.2.dll - - - - - False - D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.XtraBars.v19.2.dll - - - - False - D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.XtraEditors.v19.2.dll - - - - False - D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.XtraGrid.v19.2.dll - - - False - D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.XtraLayout.v19.2.dll - - - - - - - - - ..\..\DDMonorepo\SQLConfig\bin\Debug\DigitalData.Controls.SQLConfig.dll - - - ..\..\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll - - - ..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Config.dll - - - ..\..\DDMonorepo\Modules.Database\bin\Debug\DigitalData.Modules.Database.dll - - - False - ..\..\DDMonorepo\Modules.Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll - - - False - ..\..\DDMonorepo\Modules.Language\bin\Release\DigitalData.Modules.Language.dll - - - ..\..\DDMonorepo\Modules.Logging\bin\Release\DigitalData.Modules.Logging.dll - - - - ..\packages\NLog.4.7.10\lib\net45\NLog.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True - True - DS_DD_ECM.xsd - - - - frmExportMain.vb - - - Form - - - frmImportMain.vb - - - Form - - - frmMain.vb - - - Form - - - frmRowEditor.vb - - - Form - - - - OrderReport.vb - - - Component - - - True - True - frmMainExtra.resx - - - True - True - frmRowEditorExtra.resx - - - frmXmlEditor.vb - - - Form - - - - - True - Application.myapp - True - - - True - True - Resources.resx - - - True - Settings.settings - True - - - frmWaitForm.vb - - - Form - - - frmConfig.vb - - - Form - - - True - True - frmImportMainExtra.resx - - - True - True - frmShared.resx - - - - - frmExportMain.vb - - - frmImportMain.vb - - - frmImportMain.vb - - - frmMain.vb - - - frmRowEditor.vb - - - OrderReport.vb - - - My.Resources - ResXFileCodeGenerator - frmMainExtra.Designer.vb - - - My.Resources - ResXFileCodeGenerator - frmRowEditorExtra.Designer.vb - - - frmXmlEditor.vb - - - - VbMyResourcesResXFileCodeGenerator - Resources.Designer.vb - My.Resources - Designer - - - frmWaitForm.vb - - - frmConfig.vb - - - My.Resources - ResXFileCodeGenerator - frmImportMainExtra.Designer.vb - - - My.Resources - ResXFileCodeGenerator - frmShared.Designer.vb - - - - - DS_DD_ECM.xsd - - - Designer - MSDataSetGenerator - DS_DD_ECM.Designer.vb - - - DS_DD_ECM.xsd - - - - MyApplicationCodeGenerator - Application.Designer.vb - - - SettingsSingleFileGenerator - My - Settings.Designer.vb - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {dd1ac3b9-7595-4d3c-b9bb-97c46a480fa0} - MultiTool.Shared - - - - - \ No newline at end of file diff --git a/MultiTool.Form/My Project/Resources.Designer.vb b/MultiTool.Form/My Project/Resources.Designer.vb index fd2b55a..648d72c 100644 --- a/MultiTool.Form/My Project/Resources.Designer.vb +++ b/MultiTool.Form/My Project/Resources.Designer.vb @@ -270,6 +270,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property icon_export() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("icon_export", 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 7ec3601..b3795cf 100644 --- a/MultiTool.Form/My Project/Resources.resx +++ b/MultiTool.Form/My Project/Resources.resx @@ -145,6 +145,9 @@ ..\Resources\actions_send3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\open23.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\preview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -166,14 +169,11 @@ ..\Resources\squarified.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_reload.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\open21.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\parameters.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\itemtypechecked.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\bo_product.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -181,8 +181,8 @@ ..\Resources\paymentrefund.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\support.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\open1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\bo_unknown.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -202,8 +202,8 @@ ..\Resources\singlepageview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\open1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\parameters.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\export.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -214,8 +214,8 @@ ..\Resources\bo_validation.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\rotatecounterclockwise.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_reload.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -223,23 +223,23 @@ ..\Resources\actions_arrow4down.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_checkcircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_send1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_delete.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\followupall.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\bo_unknown2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_send.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\support.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -250,8 +250,8 @@ ..\Resources\import.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\open23.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\rotatecounterclockwise.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\pagesetup.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -259,13 +259,16 @@ ..\Resources\open.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_send.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\resetview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\itemtypechecked.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_checkcircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_delete.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\icon_export.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/MultiTool.Form/MyApplication.vb b/MultiTool.Form/MyApplication.vb index 8e5a51c..30c1163 100644 --- a/MultiTool.Form/MyApplication.vb +++ b/MultiTool.Form/MyApplication.vb @@ -1,5 +1,6 @@ -Imports MultiTool.Shared.Templates -Imports MultiTool.Shared +Imports MultiTool.Shared +Imports MultiTool.Shared.Templates +Imports MultiTool.Shared.Winline Namespace My @@ -8,6 +9,7 @@ Namespace My Friend Property MappingConfiguration As MappingConfig Friend Property MandatorConfiguration As MandatorConfig Friend Property GeneralConfiguration As GeneralConfig + Friend Property Winline As WinlineData Public Property Helpers As Helpers End Module diff --git a/MultiTool.Form/Resources/icon_export.svg b/MultiTool.Form/Resources/icon_export.svg new file mode 100644 index 0000000..4011cb6 --- /dev/null +++ b/MultiTool.Form/Resources/icon_export.svg @@ -0,0 +1,18 @@ + + + + + + + + \ No newline at end of file diff --git a/MultiTool.Form/Strings/frmImportMainExtra.Designer.vb b/MultiTool.Form/Strings/frmImportMainExtra.Designer.vb index 7ed45ad..c9d14b8 100644 --- a/MultiTool.Form/Strings/frmImportMainExtra.Designer.vb +++ b/MultiTool.Form/Strings/frmImportMainExtra.Designer.vb @@ -118,15 +118,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Sucht eine lokalisierte Zeichenfolge, die Culture: {0} ähnelt. - ''' - Friend Shared ReadOnly Property Culture___0_() As String - Get - Return ResourceManager.GetString("Culture: {0}", resourceCulture) - End Get - End Property - ''' ''' Sucht eine lokalisierte Zeichenfolge, die Datei erfolgreich in die WinLine übertragen! ähnelt. ''' @@ -298,15 +289,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Sucht eine lokalisierte Zeichenfolge, die Version {0} ähnelt. - ''' - Friend Shared ReadOnly Property Version__0_() As String - Get - Return ResourceManager.GetString("Version {0}", resourceCulture) - End Get - End Property - ''' ''' Sucht eine lokalisierte Zeichenfolge, die Vorlagenverzeichnis ähnelt. ''' diff --git a/MultiTool.Form/Strings/frmImportMainExtra.resx b/MultiTool.Form/Strings/frmImportMainExtra.resx index 3d0a36f..ac13980 100644 --- a/MultiTool.Form/Strings/frmImportMainExtra.resx +++ b/MultiTool.Form/Strings/frmImportMainExtra.resx @@ -129,9 +129,6 @@ Bitte wählen Sie einen Mandanten aus, bevor Sie fortfahren! - - Culture: {0} - Datei erfolgreich in die WinLine übertragen! @@ -186,9 +183,6 @@ Neuladen des Dokuments - - Version {0} - Vorlagenverzeichnis diff --git a/MultiTool.Form/Strings/frmMainExtra.Designer.vb b/MultiTool.Form/Strings/frmMainExtra.Designer.vb index 30b6a70..da8b66f 100644 --- a/MultiTool.Form/Strings/frmMainExtra.Designer.vb +++ b/MultiTool.Form/Strings/frmMainExtra.Designer.vb @@ -72,5 +72,23 @@ Namespace My.Resources Return ResourceManager.GetString("Laden der Vorlage", resourceCulture) End Get End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Sprache: {0} ähnelt. + ''' + Friend Shared ReadOnly Property Sprache___0_() As String + Get + Return ResourceManager.GetString("Sprache: {0}", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Version: {0} ähnelt. + ''' + Friend Shared ReadOnly Property Version___0_() As String + Get + Return ResourceManager.GetString("Version: {0}", resourceCulture) + End Get + End Property End Class End Namespace diff --git a/MultiTool.Form/Strings/frmMainExtra.resx b/MultiTool.Form/Strings/frmMainExtra.resx index 5f862a8..4de9a56 100644 --- a/MultiTool.Form/Strings/frmMainExtra.resx +++ b/MultiTool.Form/Strings/frmMainExtra.resx @@ -120,4 +120,10 @@ Laden der Vorlage + + Sprache: {0} + + + Version: {0} + \ No newline at end of file diff --git a/MultiTool.Form/frmConfig.resx.bak b/MultiTool.Form/frmConfig.resx.bak deleted file mode 100644 index 1ef0ee4..0000000 --- a/MultiTool.Form/frmConfig.resx.bak +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - 313, 17 - - - 194, 17 - - - 758, 17 - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAO4BAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iU2F2ZSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIg - MzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cjwvc3R5 - bGU+DQogIDxwYXRoIGQ9Ik0yNyw0aC0zdjEwSDhWNEg1QzQuNCw0LDQsNC40LDQsNXYyMmMwLDAuNiww - LjQsMSwxLDFoMjJjMC42LDAsMS0wLjQsMS0xVjVDMjgsNC40LDI3LjYsNCwyNyw0eiBNMjQsMjRIOHYt - NiAgaDE2VjI0eiBNMTAsNHY4aDEwVjRIMTB6IE0xNCwxMGgtMlY2aDJWMTB6IiBjbGFzcz0iQmxhY2si - IC8+DQo8L3N2Zz4L - - - - 533, 17 - - - 999, 17 - - - 1234, 17 - - \ No newline at end of file diff --git a/MultiTool.Form/frmExportMain.Designer.vb b/MultiTool.Form/frmExportMain.Designer.vb index e2f811e..651016a 100644 --- a/MultiTool.Form/frmExportMain.Designer.vb +++ b/MultiTool.Form/frmExportMain.Designer.vb @@ -22,64 +22,271 @@ Partial Class frmExportMain 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmExportMain)) Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem() + Me.BarStaticItem2 = New DevExpress.XtraBars.BarStaticItem() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPage2 = 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.GridControlDocuments = New DevExpress.XtraGrid.GridControl() + Me.GridViewDocuments = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.colNumber = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colAccount = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colDate = New DevExpress.XtraGrid.Columns.GridColumn() + Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() + Me.PanelControl1 = New DevExpress.XtraEditors.PanelControl() + Me.LabelControl1 = New DevExpress.XtraEditors.LabelControl() + Me.lookupMandator = New DevExpress.XtraEditors.GridLookUpEdit() + Me.GridLookUpEdit1View = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.colId = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colName = New DevExpress.XtraGrid.Columns.GridColumn() + Me.LabelControl2 = New DevExpress.XtraEditors.LabelControl() + Me.colSelected = New DevExpress.XtraGrid.Columns.GridColumn() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridControlDocuments, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridViewDocuments, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControl1.Panel1.SuspendLayout() + CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControl1.Panel2.SuspendLayout() + Me.SplitContainerControl1.SuspendLayout() + CType(Me.PanelControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.PanelControl1.SuspendLayout() + CType(Me.lookupMandator.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridLookUpEdit1View, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarStaticItem1, Me.BarStaticItem2, Me.BarButtonItem1}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 1 + Me.RibbonControl1.MaxItemId = 4 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) - Me.RibbonControl1.Size = New System.Drawing.Size(800, 150) + Me.RibbonControl1.Size = New System.Drawing.Size(1107, 158) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' + 'BarStaticItem1 + ' + Me.BarStaticItem1.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right + Me.BarStaticItem1.Caption = "BarStaticItem1" + Me.BarStaticItem1.Id = 1 + Me.BarStaticItem1.Name = "BarStaticItem1" + ' + 'BarStaticItem2 + ' + Me.BarStaticItem2.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right + Me.BarStaticItem2.Caption = "BarStaticItem2" + Me.BarStaticItem2.Id = 2 + Me.BarStaticItem2.Name = "BarStaticItem2" + ' + 'BarButtonItem1 + ' + Me.BarButtonItem1.Caption = "Daten einlesen" + Me.BarButtonItem1.Id = 3 + Me.BarButtonItem1.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.icon_export + Me.BarButtonItem1.Name = "BarButtonItem1" + ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) Me.RibbonPage1.Name = "RibbonPage1" Me.RibbonPage1.Text = "RibbonPage1" ' 'RibbonPageGroup1 ' + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" - Me.RibbonPageGroup1.Text = "RibbonPageGroup1" + Me.RibbonPageGroup1.Text = "Start" + ' + 'RibbonStatusBar1 + ' + Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticItem1) + Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticItem2) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 696) + Me.RibbonStatusBar1.Name = "RibbonStatusBar1" + Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1107, 24) ' 'RibbonPage2 ' Me.RibbonPage2.Name = "RibbonPage2" Me.RibbonPage2.Text = "RibbonPage2" ' - 'RibbonPageGroup2 + 'GridControlDocuments ' - Me.RibbonPageGroup2.Name = "RibbonPageGroup2" - Me.RibbonPageGroup2.Text = "RibbonPageGroup2" + Me.GridControlDocuments.Dock = System.Windows.Forms.DockStyle.Fill + Me.GridControlDocuments.Location = New System.Drawing.Point(0, 33) + Me.GridControlDocuments.MainView = Me.GridViewDocuments + Me.GridControlDocuments.MenuManager = Me.RibbonControl1 + Me.GridControlDocuments.Name = "GridControlDocuments" + Me.GridControlDocuments.Size = New System.Drawing.Size(385, 505) + Me.GridControlDocuments.TabIndex = 2 + Me.GridControlDocuments.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDocuments}) ' - 'RibbonStatusBar1 + 'GridViewDocuments ' - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 423) - Me.RibbonStatusBar1.Name = "RibbonStatusBar1" - Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(800, 27) + Me.GridViewDocuments.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colSelected, Me.colNumber, Me.colAccount, Me.colDate}) + Me.GridViewDocuments.GridControl = Me.GridControlDocuments + Me.GridViewDocuments.Name = "GridViewDocuments" + ' + 'colNumber + ' + Me.colNumber.Caption = "Belegnummer" + Me.colNumber.FieldName = "Number" + Me.colNumber.Name = "colNumber" + Me.colNumber.Visible = True + Me.colNumber.VisibleIndex = 1 + Me.colNumber.Width = 110 + ' + 'colAccount + ' + Me.colAccount.Caption = "Konto" + Me.colAccount.FieldName = "Account" + Me.colAccount.Name = "colAccount" + Me.colAccount.Visible = True + Me.colAccount.VisibleIndex = 2 + Me.colAccount.Width = 110 + ' + 'colDate + ' + Me.colDate.Caption = "Datum" + Me.colDate.FieldName = "Date" + Me.colDate.Name = "colDate" + Me.colDate.Visible = True + Me.colDate.VisibleIndex = 3 + Me.colDate.Width = 110 + ' + 'SplitContainerControl1 + ' + Me.SplitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.SplitContainerControl1.Location = New System.Drawing.Point(0, 158) + Me.SplitContainerControl1.Name = "SplitContainerControl1" + ' + 'SplitContainerControl1.Panel1 + ' + Me.SplitContainerControl1.Panel1.Controls.Add(Me.GridControlDocuments) + Me.SplitContainerControl1.Panel1.Controls.Add(Me.PanelControl1) + Me.SplitContainerControl1.Panel1.Text = "Panel1" + ' + 'SplitContainerControl1.Panel2 + ' + Me.SplitContainerControl1.Panel2.Controls.Add(Me.LabelControl2) + Me.SplitContainerControl1.Panel2.Text = "Panel2" + Me.SplitContainerControl1.Size = New System.Drawing.Size(1107, 538) + Me.SplitContainerControl1.SplitterPosition = 385 + Me.SplitContainerControl1.TabIndex = 5 + ' + 'PanelControl1 + ' + Me.PanelControl1.Controls.Add(Me.LabelControl1) + Me.PanelControl1.Controls.Add(Me.lookupMandator) + Me.PanelControl1.Dock = System.Windows.Forms.DockStyle.Top + Me.PanelControl1.Location = New System.Drawing.Point(0, 0) + Me.PanelControl1.Name = "PanelControl1" + Me.PanelControl1.Size = New System.Drawing.Size(385, 33) + Me.PanelControl1.TabIndex = 0 + ' + 'LabelControl1 + ' + Me.LabelControl1.Appearance.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Bold) + Me.LabelControl1.Appearance.Options.UseFont = True + Me.LabelControl1.Location = New System.Drawing.Point(5, 9) + Me.LabelControl1.Name = "LabelControl1" + Me.LabelControl1.Size = New System.Drawing.Size(50, 13) + Me.LabelControl1.TabIndex = 4 + Me.LabelControl1.Text = "Mandant" + ' + 'lookupMandator + ' + Me.lookupMandator.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lookupMandator.Location = New System.Drawing.Point(75, 6) + Me.lookupMandator.Name = "lookupMandator" + Me.lookupMandator.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.lookupMandator.Properties.PopupView = Me.GridLookUpEdit1View + Me.lookupMandator.Size = New System.Drawing.Size(305, 20) + Me.lookupMandator.TabIndex = 3 + ' + 'GridLookUpEdit1View + ' + Me.GridLookUpEdit1View.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colId, Me.colName}) + Me.GridLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus + Me.GridLookUpEdit1View.Name = "GridLookUpEdit1View" + Me.GridLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = False + Me.GridLookUpEdit1View.OptionsView.ShowGroupPanel = False + ' + 'colId + ' + Me.colId.Caption = "Id" + Me.colId.FieldName = "Id" + Me.colId.Name = "colId" + Me.colId.Visible = True + Me.colId.VisibleIndex = 0 + ' + 'colName + ' + Me.colName.Caption = "Name" + Me.colName.FieldName = "Name" + Me.colName.Name = "colName" + Me.colName.Visible = True + Me.colName.VisibleIndex = 1 + ' + 'LabelControl2 + ' + Me.LabelControl2.Appearance.Font = New System.Drawing.Font("Tahoma", 48.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.LabelControl2.Appearance.ForeColor = System.Drawing.Color.Silver + Me.LabelControl2.Appearance.Options.UseFont = True + Me.LabelControl2.Appearance.Options.UseForeColor = True + Me.LabelControl2.Location = New System.Drawing.Point(165, 221) + Me.LabelControl2.Name = "LabelControl2" + Me.LabelControl2.Size = New System.Drawing.Size(452, 77) + Me.LabelControl2.TabIndex = 0 + Me.LabelControl2.Text = "Nothing to see.." + ' + 'colSelected + ' + Me.colSelected.FieldName = "colSelected" + Me.colSelected.ImageOptions.SvgImage = CType(resources.GetObject("colSelected.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.colSelected.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) + Me.colSelected.Name = "colSelected" + Me.colSelected.UnboundDataType = GetType(Boolean) + Me.colSelected.Visible = True + Me.colSelected.VisibleIndex = 0 + Me.colSelected.Width = 112 ' 'frmExportMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(800, 450) - Me.Controls.Add(Me.RibbonControl1) + Me.ClientSize = New System.Drawing.Size(1107, 720) + Me.Controls.Add(Me.SplitContainerControl1) Me.Controls.Add(Me.RibbonStatusBar1) + Me.Controls.Add(Me.RibbonControl1) Me.Name = "frmExportMain" + Me.Ribbon = Me.RibbonControl1 + Me.StatusBar = Me.RibbonStatusBar1 Me.Text = "frmExportMain" CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridControlDocuments, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridViewDocuments, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl1.Panel1.ResumeLayout(False) + CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl1.Panel2.ResumeLayout(False) + Me.SplitContainerControl1.Panel2.PerformLayout() + CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl1.ResumeLayout(False) + CType(Me.PanelControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.PanelControl1.ResumeLayout(False) + Me.PanelControl1.PerformLayout() + CType(Me.lookupMandator.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridLookUpEdit1View, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -88,7 +295,23 @@ Partial Class frmExportMain Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents BarStaticItem1 As DevExpress.XtraBars.BarStaticItem + Friend WithEvents BarStaticItem2 As DevExpress.XtraBars.BarStaticItem + Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents GridControlDocuments As DevExpress.XtraGrid.GridControl + Friend WithEvents GridViewDocuments As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl + Friend WithEvents PanelControl1 As DevExpress.XtraEditors.PanelControl + Friend WithEvents LabelControl1 As DevExpress.XtraEditors.LabelControl + Friend WithEvents lookupMandator As DevExpress.XtraEditors.GridLookUpEdit + Friend WithEvents GridLookUpEdit1View As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents colId As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colName As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents LabelControl2 As DevExpress.XtraEditors.LabelControl + Friend WithEvents colNumber As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colAccount As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colDate As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colSelected As DevExpress.XtraGrid.Columns.GridColumn End Class diff --git a/MultiTool.Form/frmExportMain.resx b/MultiTool.Form/frmExportMain.resx index 1af7de1..9c6d1fe 100644 --- a/MultiTool.Form/frmExportMain.resx +++ b/MultiTool.Form/frmExportMain.resx @@ -117,4 +117,22 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFUCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzczNzM3NDt9Cgku + WWVsbG93e2ZpbGw6I0ZDQjAxQjt9CgkuR3JlZW57ZmlsbDojMTI5QzQ5O30KCS5CbHVle2ZpbGw6IzM4 + N0NCNzt9CgkuUmVke2ZpbGw6I0QwMjEyNzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tk + aXNwbGF5Om5vbmU7ZmlsbDojNzM3Mzc0O30KPC9zdHlsZT4NCiAgPHBvbHlnb24gcG9pbnRzPSIyNyw0 + IDExLDIwIDUsMTQgMiwxNyAxMSwyNiAzMCw3ICIgY2xhc3M9IkdyZWVuIiAvPg0KPC9zdmc+Cw== + + \ No newline at end of file diff --git a/MultiTool.Form/frmExportMain.vb b/MultiTool.Form/frmExportMain.vb index 78aa473..726bd15 100644 --- a/MultiTool.Form/frmExportMain.vb +++ b/MultiTool.Form/frmExportMain.vb @@ -1,3 +1,96 @@ -Public Class frmExportMain +Imports DigitalData.GUIs.Common +Imports DigitalData.Modules.Config +Imports DigitalData.Modules.Database +Imports DigitalData.Modules.Logging +Imports MultiTool.Shared +Imports MultiTool.Shared.Templates +Imports MultiTool.Shared.Winline + +Public Class frmExportMain + Private ReadOnly LogConfig As LogConfig + Private ReadOnly ConfigManager As ConfigManager(Of Config) + Private ReadOnly CurrentTemplate As Template = Nothing + + Private Logger As Logger + Private FormHelper As FormHelper + Private Database As MSSQLServer + Private WebService As WebServiceData + Private Winline As WinlineData + Private GridBuilder As GridBuilder + Private FileEx As DigitalData.Modules.Filesystem.File + + Public Sub New(pLogConfig As LogConfig, pConfigManager As ConfigManager(Of Config), pTemplate As Template) + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + LogConfig = pLogConfig + ConfigManager = pConfigManager + CurrentTemplate = pTemplate + End Sub + + Private Sub frmExportMain_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Try + Text = String.Format(My.Resources.frmShared._0____WebService_Multitool_für_WinLine, CurrentTemplate.Name) + + Logger = LogConfig.GetLogger() + FormHelper = New FormHelper(LogConfig) + + ' Initialize Database + Dim oConnectionString = MSSQLServer.DecryptConnectionString(ConfigManager.Config.ConnectionString) + Database = New MSSQLServer(LogConfig, oConnectionString) + + GridBuilder = New GridBuilder(GridViewDocuments) + GridBuilder. + WithDefaults(). + WithReadOnlyOptions(). + WithClipboardHandler() + + Winline = My.Winline + FileEx = New DigitalData.Modules.Filesystem.File(LogConfig) + WebService = New WebServiceData(LogConfig, My.GeneralConfiguration.Webservice, My.GeneralConfiguration.OutputWebserviceDirectory) + AddHandler WebService.WebServiceProgress, AddressOf WebService_Progress + + Catch ex As Exception + FormHelper.ShowError(ex, My.Resources.frmImportMainExtra.Initialisieren_der_Anwendungs_Daten) + + End Try + End Sub + + Private Sub frmExportMain_Shown(sender As Object, e As EventArgs) Handles Me.Shown + Try + lookupMandator.Properties.DataSource = Winline.Mandators + lookupMandator.ForceInitialize() + lookupMandator.Properties.View.BestFitColumns() + Catch ex As Exception + FormHelper.ShowError(ex, "Initialisierung der Form") + End Try + End Sub + + Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + Try + Dim oMandator = lookupMandator.EditValue + + If oMandator Is Nothing Then + FormHelper.ShowWarning("Bitte einen Mandanten auswählen!") + Exit Sub + End If + + 'TODO: Make Document Type configurable + + Dim oDocuments = Winline.GetDocuments(oMandator, WinlineData.DocumentType.Order) + + GridControlDocuments.DataSource = oDocuments + + Console.WriteLine() + Catch ex As Exception + FormHelper.ShowError(ex, "Laden der Daten") + End Try + End Sub + + Private Sub WebService_Progress(sender As Object, e As String) + Throw New NotImplementedException() + End Sub + End Class \ No newline at end of file diff --git a/MultiTool.Form/frmImportMain.en.resx.bak b/MultiTool.Form/frmImportMain.en.resx.bak deleted file mode 100644 index 3ccabfc..0000000 --- a/MultiTool.Form/frmImportMain.en.resx.bak +++ /dev/null @@ -1,321 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - - - - - - - - Default - - - Top, Left - - - - - - Tile - - - Inherit - - - - 0, 0 - - - - Center - - - - - - - None - - - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHICAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z - ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz - OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp - dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkNoZWNrQ2lyY2xlZCI+DQogICAgPHBhdGggZD0iTTE2 - LDRDOS40LDQsNCw5LjQsNCwxNmMwLDYuNiw1LjQsMTIsMTIsMTJzMTItNS40LDEyLTEyQzI4LDkuNCwy - Mi42LDQsMTYsNHogTTE0LDIybC02LTZsMi0ybDQsNGw4LThsMiwyICAgTDE0LDIyeiIgY2xhc3M9Ikdy - ZWVuIiAvPg0KICA8L2c+DQo8L3N2Zz4L - - - - - -1 - - - -1 - - - - - - - - - -1 - - - -1 - - - - - - -1 - - - -1 - - - - - - -1 - - - -1 - - - -1 - - - -1 - - - -1 - - - -1 - - - -1 - - - -1 - - - -1 - - - -1 - - - -1 - - - -1 - - - -1 - - - -1 - - - -1 - - - -1 - - - -1 - - - -1 - - - -1 - - - -1 - - - -1 - - - -1 - - - -1 - - - -1 - - - - - - -1 - - - -1 - - - -1 - - - -1 - - - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAACgDAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9Cgku - QmxhY2t7ZmlsbDojNzI3MjcyO30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5ZZWxsb3d7ZmlsbDojRkZC - MTE1O30KCS5CbHVle2ZpbGw6IzExNzdENzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iU3F1YXJpZmll - ZCI+DQogICAgPHJlY3QgeD0iMiIgeT0iMiIgd2lkdGg9IjE4IiBoZWlnaHQ9IjE4IiByeD0iMCIgcnk9 - IjAiIGNsYXNzPSJCbHVlIiAvPg0KICAgIDxyZWN0IHg9IjIyIiB5PSIyIiB3aWR0aD0iOCIgaGVpZ2h0 - PSIxOCIgcng9IjAiIHJ5PSIwIiBjbGFzcz0iR3JlZW4iIC8+DQogICAgPHJlY3QgeD0iMiIgeT0iMjIi - IHdpZHRoPSIxOCIgaGVpZ2h0PSI4IiByeD0iMCIgcnk9IjAiIGNsYXNzPSJSZWQiIC8+DQogICAgPHJl - Y3QgeD0iMjIiIHk9IjIyIiB3aWR0aD0iOCIgaGVpZ2h0PSI4IiByeD0iMCIgcnk9IjAiIGNsYXNzPSJZ - ZWxsb3ciIC8+DQogIDwvZz4NCjwvc3ZnPgs= - - - \ No newline at end of file diff --git a/MultiTool.Form/frmImportMain.resx.bak b/MultiTool.Form/frmImportMain.resx.bak deleted file mode 100644 index 2790466..0000000 --- a/MultiTool.Form/frmImportMain.resx.bak +++ /dev/null @@ -1,998 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - Fill - - - - 0, 158 - - - Fill - - - 0, 33 - - - gridBand1 - - - Ausgewählt - - - - True - - - 27 - - - gridBand1 - - - 27 - - - gridBand3 - - - Dateiname - - - True - - - 683 - - - Eingegangen - - - True - - - 299 - - - Mandant - - - False - - - - Combo - - - SIVT - - - True - - - 384 - - - GridBand2 - - - 683 - - - BandedGridColumn1 - - - True - - - Version 1.0.0.0 - - - 0 Dateien geladen - - - Dateien einlesen - - - Aktuelle Datei übermitteln - - - Eingangsverzeichnis öffnen - - - Ausgangsverzeichnis öffnen - - - Vorlagenverzeichnis öffnen - - - Aktuelle Datei neu laden - - - Ausgewählte Dateien übermitteln - - - Belegvorschau für aktuelle Datei anzeigen - - - XML-Datei anzeigen - - - Logverzeichnis öffnen - - - Konfigurationsverzeichnis öffnen - - - Aktuelle Datei: Keine - - - Konfiguration - - - Culture xx-xx - - - Zeile löschen - - - BarWorkspaceMenuItem1 - - - 336, 17 - - - True - - - 6, 13 - - - 189, 17 - - - 1215, 746 - - - 0, 722 - - - 1215, 24 - - - RibbonStatusBar - - - DevExpress.XtraBars.Ribbon.RibbonStatusBar, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - $this - - - 1 - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAACgDAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9Cgku - QmxhY2t7ZmlsbDojNzI3MjcyO30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5ZZWxsb3d7ZmlsbDojRkZC - MTE1O30KCS5CbHVle2ZpbGw6IzExNzdENzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iU3F1YXJpZmll - ZCI+DQogICAgPHJlY3QgeD0iMiIgeT0iMiIgd2lkdGg9IjE4IiBoZWlnaHQ9IjE4IiByeD0iMCIgcnk9 - IjAiIGNsYXNzPSJCbHVlIiAvPg0KICAgIDxyZWN0IHg9IjIyIiB5PSIyIiB3aWR0aD0iOCIgaGVpZ2h0 - PSIxOCIgcng9IjAiIHJ5PSIwIiBjbGFzcz0iR3JlZW4iIC8+DQogICAgPHJlY3QgeD0iMiIgeT0iMjIi - IHdpZHRoPSIxOCIgaGVpZ2h0PSI4IiByeD0iMCIgcnk9IjAiIGNsYXNzPSJSZWQiIC8+DQogICAgPHJl - Y3QgeD0iMjIiIHk9IjIyIiB3aWR0aD0iOCIgaGVpZ2h0PSI4IiByeD0iMCIgcnk9IjAiIGNsYXNzPSJZ - ZWxsb3ciIC8+DQogIDwvZz4NCjwvc3ZnPgs= - - - - {0} - WebService Multitool für WinLine - - - GridViewFiles - - - DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - gridBand1 - - - DevExpress.XtraGrid.Views.BandedGrid.GridBand, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - colSelected - - - DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - GridBand2 - - - DevExpress.XtraGrid.Views.BandedGrid.GridBand, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - colFilename - - - DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - colCreatedAt - - - DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - colMandator - - - DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - cmbMandators - - - DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - BandedGridColumn1 - - - DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - txtVersion - - - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - txtFilesLoaded - - - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - btnLoadFiles - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - btnTransferFile - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - btnOpenInputDirectory - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - btnOpenOutputDirectory - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - btnOpenSchemaDirectory - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - btnReloadFile - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - btnTransferAllFiles - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - btnOpenReport - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - btnShowXml - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - btnOpenLogDirectory - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - btnOpenConfigDirectory - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - txtCurrentFile - - - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - btnConfig - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - txtCulture - - - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - btnRemoveRow - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - BarWorkspaceMenuItem1 - - - DevExpress.XtraBars.BarWorkspaceMenuItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - WorkspaceManager1 - - - DevExpress.Utils.WorkspaceManager, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - btnTestTransferFile - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - BarButtonItem1 - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RibbonPage1 - - - DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RibbonPageGroup1 - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RibbonPageGroup4 - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RibbonPageGroup3 - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RibbonPageGroup7 - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RibbonPage2 - - - DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RibbonPageGroup5 - - - 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 - - - RepositoryItemComboBox1 - - - DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RepositoryItemProgressBar1 - - - DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - GridLookUpEdit1View - - - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - colId - - - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - colName - - - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - GridView1 - - - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - GridView2 - - - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - GridView3 - - - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - GridView4 - - - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - BehaviorManager - - - DevExpress.Utils.Behaviors.BehaviorManager, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplashScreenManager - - - DevExpress.XtraSplashScreen.SplashScreenManager, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - frmImportMain - - - DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Übermittlung Testen - - - BarButtonItem1 - - - 0, 0 - - - Einlesen - - - Auswertung - - - Übermittlung - - - Bearbeitung - - - Start - - - Verzeichnisse - - - RibbonPageGroup2 - - - Erweitert - - - False - - - Combo - - - 1215, 158 - - - RibbonControl - - - DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - $this - - - 2 - - - 340, 531 - - - 0 - - - GridControlFiles - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerMain.Panel1 - - - 0 - - - True - - - Tahoma, 8.25pt, style=Bold - - - 5, 9 - - - 50, 13 - - - 2 - - - Mandant - - - LabelControl1 - - - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - PanelControl1 - - - 0 - - - Top, Left, Right - - - 75, 6 - - - Combo - - - Id - - - True - - - 0 - - - Name - - - True - - - 1 - - - 255, 20 - - - 1 - - - lookupMandator - - - DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - PanelControl1 - - - 1 - - - Top - - - 0, 0 - - - 340, 33 - - - 2 - - - PanelControl1 - - - DevExpress.XtraEditors.PanelControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerMain.Panel1 - - - 1 - - - Panel1 - - - Fill - - - 0, 0 - - - Fill - - - 0, 0 - - - Fill - - - 0, 0 - - - 865, 129 - - - 0 - - - GridControl1 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerGrids1.Panel1 - - - 0 - - - Panel1 - - - Fill - - - 0, 0 - - - 865, 149 - - - 0 - - - GridControl2 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerGrids1.Panel2 - - - 0 - - - Panel2 - - - 865, 288 - - - 0 - - - SplitContainerGrids1 - - - DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerGrids.Panel1 - - - 0 - - - Panel1 - - - Fill - - - 0, 0 - - - Fill - - - 0, 0 - - - 865, 126 - - - 0 - - - GridControl3 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerGrids2.Panel1 - - - 0 - - - Panel1 - - - Fill - - - 0, 0 - - - 865, 130 - - - 0 - - - GridControl4 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerGrids2.Panel2 - - - 0 - - - Panel2 - - - 865, 266 - - - 0 - - - SplitContainerGrids2 - - - DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerGrids.Panel2 - - - 0 - - - Panel2 - - - 865, 564 - - - 0 - - - SplitContainerGrids - - - DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerMain.Panel2 - - - 0 - - - Panel2 - - - 1215, 564 - - - 2 - - - SplitContainerMain - - - DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - $this - - - 0 - - \ No newline at end of file diff --git a/MultiTool.Form/frmImportMain.vb b/MultiTool.Form/frmImportMain.vb index 22fae86..fb79b7d 100644 --- a/MultiTool.Form/frmImportMain.vb +++ b/MultiTool.Form/frmImportMain.vb @@ -15,6 +15,7 @@ Imports MultiTool.Shared.Winline Imports MultiTool.Shared.Winline.Entities Imports MultiTool.Shared.Constants Imports MultiTool.Shared.Exceptions +Imports Document = MultiTool.Shared.Documents.Document Public Class frmImportMain Public LogConfig As LogConfig @@ -74,8 +75,8 @@ Public Class frmImportMain GridBuilder.WithDefaults.WithReadOnlyOptions.WithClipboardHandler() GridViewFiles.OptionsView.ShowAutoFilterRow = False + Winline = My.Winline FileEx = New DigitalData.Modules.Filesystem.File(LogConfig) - Winline = New WinlineData(LogConfig, Database, My.GeneralConfiguration, My.MappingConfiguration, My.MandatorConfiguration) WebService = New WebServiceData(LogConfig, My.GeneralConfiguration.Webservice, My.GeneralConfiguration.OutputWebserviceDirectory) AddHandler WebService.WebServiceProgress, AddressOf WebService_Progress @@ -84,31 +85,14 @@ Public Class frmImportMain End Try - txtVersion.Caption = String.Format(My.Resources.frmImportMainExtra.Version__0_, My.Application.Info.Version.ToString) - txtCulture.Caption = String.Format(My.Resources.frmImportMainExtra.Culture___0_, My.Application.UICulture.ToString) Text = String.Format(My.Resources.frmShared._0____WebService_Multitool_für_WinLine, CurrentTemplate.Name) End Sub - Private Async Sub frmImportMain_Shown(sender As Object, e As EventArgs) Handles MyBase.Shown + Private Sub frmImportMain_Shown(sender As Object, e As EventArgs) Handles MyBase.Shown btnLoadFiles.Enabled = False SplashScreenManager.ShowWaitForm() - ' Load WinLine Data Try - SplashScreenManager.SetWaitFormDescription("Lade Basisdaten") - Winline.Mandators.Clear() - Winline.LoadEconomicYears() - Await Winline.LoadMandators() - - For Each oMandator As Mandator In Winline.Mandators - SplashScreenManager.SetWaitFormDescription(String.Format(My.Resources.frmImportMainExtra.Lade__0__Konten, oMandator.Id)) - Await Winline.LoadAccounts(oMandator) - SplashScreenManager.SetWaitFormDescription(String.Format(My.Resources.frmImportMainExtra.Lade__0__Artikel, oMandator.Id)) - Await Winline.LoadArticles(oMandator) - SplashScreenManager.SetWaitFormDescription(String.Format(My.Resources.frmImportMainExtra.Lade__0__Belegarten, oMandator.Id)) - Await Winline.LoadDocumentKinds(oMandator) - Next - SplashScreenManager.SetWaitFormDescription(My.Resources.frmImportMainExtra.Lade_Oberfläche) lookupMandator.Properties.DataSource = Winline.Mandators diff --git a/MultiTool.Form/frmMain.Designer.vb b/MultiTool.Form/frmMain.Designer.vb index e7e7849..57bfac7 100644 --- a/MultiTool.Form/frmMain.Designer.vb +++ b/MultiTool.Form/frmMain.Designer.vb @@ -20,12 +20,15 @@ Partial Class frmMain _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain)) 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.txtVersion = New DevExpress.XtraBars.BarStaticItem() + Me.txtCulture = New DevExpress.XtraBars.BarStaticItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -39,7 +42,7 @@ Partial Class frmMain Me.colName = New DevExpress.XtraGrid.Columns.GridColumn() Me.colDescription = New DevExpress.XtraGrid.Columns.GridColumn() Me.colFileName = New DevExpress.XtraGrid.Columns.GridColumn() - Me.SplashScreenManager1 = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, GetType(Global.MultiTool.Form.frmWaitForm), True, True) + Me.SplashScreenManager = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, GetType(Global.MultiTool.Form.frmWaitForm), True, True) CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -50,9 +53,9 @@ Partial Class frmMain ' 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.btnOpenImportExportForm, Me.BarButtonItem1, Me.BarButtonItem4, Me.BarButtonItem2, Me.BarButtonItem3}) + 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.txtVersion, Me.txtCulture}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 8 + Me.RibbonControl1.MaxItemId = 10 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage3}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] @@ -96,6 +99,21 @@ Partial Class frmMain Me.BarButtonItem3.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.logical1 Me.BarButtonItem3.Name = "BarButtonItem3" ' + 'txtVersion + ' + Me.txtVersion.Caption = "Version" + Me.txtVersion.Id = 8 + Me.txtVersion.ImageOptions.SvgImage = CType(resources.GetObject("txtVersion.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.txtVersion.Name = "txtVersion" + Me.txtVersion.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph + ' + 'txtCulture + ' + Me.txtCulture.Caption = "Sprache" + Me.txtCulture.Id = 9 + Me.txtCulture.ImageOptions.SvgImage = CType(resources.GetObject("txtCulture.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.txtCulture.Name = "txtCulture" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup3}) @@ -131,6 +149,8 @@ Partial Class frmMain ' 'RibbonStatusBar1 ' + Me.RibbonStatusBar1.ItemLinks.Add(Me.txtVersion) + Me.RibbonStatusBar1.ItemLinks.Add(Me.txtCulture) Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 513) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 @@ -189,7 +209,7 @@ Partial Class frmMain ' 'SplashScreenManager1 ' - Me.SplashScreenManager1.ClosingDelay = 500 + Me.SplashScreenManager.ClosingDelay = 500 ' 'frmMain ' @@ -231,5 +251,7 @@ Partial Class frmMain Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents SplashScreenManager1 As DevExpress.XtraSplashScreen.SplashScreenManager + Friend WithEvents SplashScreenManager As DevExpress.XtraSplashScreen.SplashScreenManager + Friend WithEvents txtVersion As DevExpress.XtraBars.BarStaticItem + Friend WithEvents txtCulture As DevExpress.XtraBars.BarStaticItem End Class diff --git a/MultiTool.Form/frmMain.resx b/MultiTool.Form/frmMain.resx index f722219..08c0989 100644 --- a/MultiTool.Form/frmMain.resx +++ b/MultiTool.Form/frmMain.resx @@ -117,7 +117,62 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAADsEAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk + aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp + c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41 + O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7 + ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp + c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnPg0KICAgIDxnIGNsYXNzPSJz + dDEiPg0KICAgICAgPHJlY3QgeD0iMiIgeT0iMTIiIHdpZHRoPSIxOCIgaGVpZ2h0PSIxOCIgcng9IjAi + IHJ5PSIwIiBjbGFzcz0iWWVsbG93IiAvPg0KICAgIDwvZz4NCiAgICA8cG9seWdvbiBwb2ludHM9IjIy + LDExLjQgMjIsMzAgMzAsMjIgMzAsMy40ICAiIGNsYXNzPSJZZWxsb3ciIC8+DQogICAgPGcgY2xhc3M9 + InN0MCI+DQogICAgICA8cGF0aCBkPSJNOS45LDEwSDJsOC04aDcuOUw5LjksMTB6IE0yMC43LDJsLTgs + OGg3LjlsOC04SDIwLjd6IiBjbGFzcz0iWWVsbG93IiAvPg0KICAgIDwvZz4NCiAgPC9nPg0KPC9zdmc+ + Cw== + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANQEAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk + aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp + c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41 + O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7 + ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp + c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxwYXRoIGQ9Ik0yNi4yLDExLjhs + LTEsMC44QzI1LDEyLjgsMjMuNCwxNCwyMS40LDE0Yy0xLjQsMC0yLjctMC42LTMuNi0xLjhDMTcuNiwx + MiwxNy41LDEyLDE3LjQsMTJjMCwwLTAuMSwwLTAuMSwwICBsMS4yLDMuNmMwLjIsMC41LTAuMSwxLjEt + MC42LDEuM2wtMy44LDEuNGMtMC41LDAuMi0xLjEtMC4xLTEuMy0wLjZsLTEuOS01LjJMOS40LDhDNi4x + LDEwLjEsNCwxMy44LDQsMThjMCw2LjYsNS40LDEyLDEyLDEyICBzMTItNS40LDEyLTEyQzI4LDE1Ljcs + MjcuMywxMy42LDI2LjIsMTEuOHoiIGNsYXNzPSJCbHVlIiAvPg0KICA8cGF0aCBkPSJNMjEuMiwzYzAs + MC0yLjgsMi4zLTQuNiwwYy0xLjgtMi4yLTQuNS0wLjEtNC42LDBsLTIsMC42bDIuOCw4LjFsMS42LDQu + M2wxLjktMC43TDE0LjgsMTEgIGMwLjEtMC4xLDIuOC0yLjIsNC42LDBjMS44LDIuMyw0LjYsMCw0LjYs + MEwyMS4yLDN6IiBjbGFzcz0iUmVkIiAvPg0KPC9zdmc+Cw== + + - 17, 17 + 196, 17 \ No newline at end of file diff --git a/MultiTool.Form/frmMain.vb b/MultiTool.Form/frmMain.vb index 43c6bfe..7a5f2a9 100644 --- a/MultiTool.Form/frmMain.vb +++ b/MultiTool.Form/frmMain.vb @@ -6,6 +6,8 @@ Imports DigitalData.Modules.Config Imports DigitalData.Modules.Database Imports DigitalData.Modules.Logging Imports MultiTool.Shared.Templates +Imports MultiTool.Shared.Winline +Imports MultiTool.Shared.Winline.Entities Public Class frmMain Private LogConfig As LogConfig @@ -15,6 +17,7 @@ Public Class frmMain Private TemplateLoader As TemplateLoader Private GridBuilder As GridBuilder Private FormHelper As FormHelper + Private WinLine As WinlineData Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles MyBase.Load Try @@ -33,10 +36,10 @@ Public Class frmMain End Sub Private Async Sub frmMain_Shown(sender As Object, e As EventArgs) Handles Me.Shown - SplashScreenManager1.ShowWaitForm() + SplashScreenManager.ShowWaitForm() Try - SplashScreenManager1.SetWaitFormDescription("Initialisierung der Grundfunktionen") + SplashScreenManager.SetWaitFormDescription("Initialisierung der Grundfunktionen") FormHelper = New FormHelper(LogConfig) ConfigManager = New ConfigManager(Of [Shared].Config)(LogConfig, @@ -62,13 +65,13 @@ Public Class frmMain End If End If - SplashScreenManager1.SetWaitFormDescription("Initialisierung der Datenbankverbindung") + SplashScreenManager.SetWaitFormDescription("Initialisierung der Datenbankverbindung") ' Initialize Database Dim oConnectionString = MSSQLServer.DecryptConnectionString(ConfigManager.Config.ConnectionString) Database = New MSSQLServer(LogConfig, oConnectionString) - SplashScreenManager1.SetWaitFormDescription("Initialisierung der Vorlagen") + SplashScreenManager.SetWaitFormDescription("Initialisierung der Vorlagen") ' Initialize Schemas TemplateLoader = New TemplateLoader(LogConfig, Database) @@ -90,12 +93,32 @@ Public Class frmMain oBindingSource.Add(oTemplate) Next + SplashScreenManager.SetWaitFormDescription("Lade Winline Stammdaten") + WinLine = New WinlineData(LogConfig, Database, My.GeneralConfiguration, My.MappingConfiguration, My.MandatorConfiguration) + WinLine.Mandators.Clear() + WinLine.LoadEconomicYears() + Await WinLine.LoadMandators() + + For Each oMandator As Mandator In WinLine.Mandators + SplashScreenManager.SetWaitFormDescription(String.Format(My.Resources.frmImportMainExtra.Lade__0__Konten, oMandator.Id)) + Await WinLine.LoadAccounts(oMandator) + SplashScreenManager.SetWaitFormDescription(String.Format(My.Resources.frmImportMainExtra.Lade__0__Artikel, oMandator.Id)) + Await WinLine.LoadArticles(oMandator) + SplashScreenManager.SetWaitFormDescription(String.Format(My.Resources.frmImportMainExtra.Lade__0__Belegarten, oMandator.Id)) + Await WinLine.LoadDocumentKinds(oMandator) + Next + + My.Winline = WinLine + GridControl1.DataSource = oBindingSource + + txtVersion.Caption = String.Format(My.Resources.frmMainExtra.Version___0_, My.Application.Info.Version.ToString) + txtCulture.Caption = String.Format(My.Resources.frmMainExtra.Sprache___0_, My.Application.UICulture.ToString) Catch ex As Exception FormHelper.ShowError(ex, My.Resources.frmImportMainExtra.Laden_der_Winline_Daten) Finally - SplashScreenManager1.CloseWaitForm() + SplashScreenManager.CloseWaitForm() End Try End Sub @@ -120,7 +143,8 @@ Public Class frmMain Dim oForm As New frmImportMain(LogConfig, ConfigManager, oTemplate) oForm.ShowDialog() Else - MsgBox("Export-Vorlagen werden noch nicht unterstützt!", MsgBoxStyle.Exclamation, Text) + Dim oForm As New frmExportMain(LogConfig, ConfigManager, oTemplate) + oForm.ShowDialog() End If Catch ex As Exception @@ -161,6 +185,7 @@ Public Class frmMain TryOpenDirectory(LogConfig.LogDirectory, My.Resources.frmImportMainExtra.Logverzeichnis) End Sub + Private Sub RibbonControl1_Click(sender As Object, e As EventArgs) Handles RibbonControl1.Click - + End Sub End Class \ No newline at end of file diff --git a/MultiTool.Form/frmRowEditor.resx.bak b/MultiTool.Form/frmRowEditor.resx.bak deleted file mode 100644 index 1e55e8a..0000000 --- a/MultiTool.Form/frmRowEditor.resx.bak +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIIFAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ - LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3 - RDc7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7b3Bh - Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tm - aWxsOiNGRkIxMTU7fQo8L3N0eWxlPg0KICA8ZyAvPg0KICA8ZyBpZD0iUmVuYW1lIj4NCiAgICA8cGF0 - aCBkPSJNMjEuNiwxMC4zYzAtMC43LTAuMy0xLjMtMC45LTEuN0MyMC4xLDguMiwxOS4xLDgsMTcuOSw4 - SDE0djkuOVYxOGg0YzEuMiwwLDIuMi0wLjIsMi45LTAuOCAgIEMyMS43LDE2LjYsMjIsMTYsMjIsMTVj - MC0wLjYtMC4yLTEuMi0wLjctMS42Yy0wLjUtMC40LTEuMS0wLjctMS44LTAuOGMwLjYtMC4yLDEuMS0w - LjUsMS41LTAuOUMyMS40LDExLjMsMjEuNiwxMC45LDIxLjYsMTAuM3ogICAgTTE2LjQsOS43aDAuOWMx - LjEsMCwxLjcsMC40LDEuNywxLjFjMCwwLjQtMC4xLDAuNy0wLjQsMC45QzE4LjQsMTEuOSwxOCwxMiwx - Ny41LDEyaC0xLjFWOS43eiBNMTksMTUuOGMtMC4zLDAuMi0wLjgsMC40LTEuMywwLjQgICBoLTEuM3Yt - Mi42aDEuM2MwLjUsMCwwLjksMC4xLDEuMywwLjNjMC4zLDAuMiwwLjUsMC42LDAuNSwwLjlDMTkuNSwx - NS4zLDE5LjQsMTUuNiwxOSwxNS44eiBNMTcuMiwyMkgxYy0wLjUsMC0xLTAuNS0xLTFWNSAgIGMwLTAu - NSwwLjUtMSwxLTFoMjRjMC41LDAsMSwwLjUsMSwxdjguMmwtMiwyVjZIMnYxNGgxNy4yTDE3LjIsMjJ6 - IE00LjEsMThoMi4ybDAuNi0yLjNoMy4ybDAuNiwyLjNIMTNMOS44LDhINy40TDQuMSwxOHogICAgTTgu - NCwxMC43YzAuMS0wLjMsMC4xLTAuNiwwLjEtMC45aDAuMWMwLDAuMywwLjEsMC42LDAuMSwwLjlsMSwz - LjNINy40TDguNCwxMC43eiIgY2xhc3M9IkJsYWNrIiAvPg0KICAgIDxwYXRoIGQ9Ik0yOSwyMWwtOCw4 - bC00LTRsOC04TDI5LDIxeiBNMzAsMjBsMS43LTEuN2MwLjQtMC40LDAuNC0xLDAtMS4zTDI5LDE0LjNj - LTAuNC0wLjQtMS0wLjQtMS4zLDBMMjYsMTZMMzAsMjB6ICAgIE0xNiwyNnY0aDRMMTYsMjZ6IiBjbGFz - cz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== - - - \ No newline at end of file diff --git a/MultiTool.Shared/Documents/DocumentCleaner.vb b/MultiTool.Shared/Documents/DocumentCleaner.vb index cf90bba..bd4f900 100644 --- a/MultiTool.Shared/Documents/DocumentCleaner.vb +++ b/MultiTool.Shared/Documents/DocumentCleaner.vb @@ -18,8 +18,11 @@ Namespace Documents Public Function CleanImportedDocuments(pDocuments As List(Of Document)) As Boolean Dim oResult = True Dim oOutputDirectory = FileEx.GetDateDirectory(GeneralConfig.OutputXmlFileDirectory) + Dim oImportedDocuments = pDocuments. + Where(Function(doc) doc.Imported = True). + ToList() - For Each oDocument As Document In pDocuments + For Each oDocument As Document In oImportedDocuments Try Dim oFileinfo = New FileInfo(oDocument.FullName) Dim oDestination = Path.Combine(oOutputDirectory, oFileinfo.Name) diff --git a/MultiTool.Shared/Helpers.vb b/MultiTool.Shared/Helpers.vb index 6d0c6cf..f8914fd 100644 --- a/MultiTool.Shared/Helpers.vb +++ b/MultiTool.Shared/Helpers.vb @@ -1,9 +1,14 @@ Imports DigitalData.Modules.Logging Public Class Helpers - Inherits BaseClass + Private ReadOnly LogConfig As LogConfig + Private ReadOnly Logger As Logger + ''' + ''' This class needs to initialize the logger by itself! + ''' Public Sub New(pLogConfig As LogConfig) - MyBase.New(pLogConfig) + LogConfig = pLogConfig + Logger = pLogConfig.GetLogger End Sub End Class diff --git a/MultiTool.Shared/MultiTool.Shared.vbproj b/MultiTool.Shared/MultiTool.Shared.vbproj index 3ae742d..de51d40 100644 --- a/MultiTool.Shared/MultiTool.Shared.vbproj +++ b/MultiTool.Shared/MultiTool.Shared.vbproj @@ -136,6 +136,7 @@ + diff --git a/MultiTool.Shared/Winline/Entities/Document.vb b/MultiTool.Shared/Winline/Entities/Document.vb new file mode 100644 index 0000000..e70c3d7 --- /dev/null +++ b/MultiTool.Shared/Winline/Entities/Document.vb @@ -0,0 +1,9 @@ +Namespace Winline.Entities + Public Class Document + Public Property Account As Account + Public Property RunningNumber As String + Public Property Number As String + Public Property [Date] As Date + End Class + +End Namespace \ No newline at end of file diff --git a/MultiTool.Shared/Winline/WebServiceData.vb b/MultiTool.Shared/Winline/WebServiceData.vb index 48506d5..3c4ed34 100644 --- a/MultiTool.Shared/Winline/WebServiceData.vb +++ b/MultiTool.Shared/Winline/WebServiceData.vb @@ -30,7 +30,7 @@ Namespace Winline RaiseEvent WebServiceProgress(Me, pMessage) End Sub - Public Async Function TransferDocumentToWinline(pDocument As Document, pMandator As Mandator, Optional pIsTest As Boolean = False) As Task(Of Boolean) + Public Async Function TransferDocumentToWinline(pDocument As Documents.Document, pMandator As Mandator, Optional pIsTest As Boolean = False) As Task(Of Boolean) Dim oBytes As Byte() = GetBytesFromDocument(pDocument) Dim oWS = Config @@ -105,6 +105,10 @@ Namespace Winline End Try End Function + Async Function ExportDocumentFromWinline() As Task + 'TODO: Implement export call to winline + End Function + Private Async Function HandleResponse(pResponse As HttpResponseMessage, pOutputPath As String, pBaseFileNAme As String) As Task pResponse.EnsureSuccessStatusCode() Dim oResponseBody As String = Await pResponse.Content.ReadAsStringAsync() @@ -166,7 +170,7 @@ Namespace Winline End Try End Function - Private Function GetBytesFromDocument(pDocument As Document) As Byte() + Private Function GetBytesFromDocument(pDocument As Documents.Document) As Byte() Using oStream As New IO.MemoryStream() Dim w = XmlWriter.Create(oStream) diff --git a/MultiTool.Shared/Winline/WinlineData.vb b/MultiTool.Shared/Winline/WinlineData.vb index d1a1faa..78116c4 100644 --- a/MultiTool.Shared/Winline/WinlineData.vb +++ b/MultiTool.Shared/Winline/WinlineData.vb @@ -29,6 +29,14 @@ Namespace Winline MappingConfig = pMappingConfig End Sub + Public Enum DocumentType + Offer = 1 + Order = 2 + DeliverySlip = 3 + Invoice = 4 + End Enum + + Public Async Function LoadArticles(pMandator As Mandator) As Task Logger.Info("Loading Articles for Mandator [{0}]", pMandator) Dim oYear = Config.GetWinLineYear() @@ -447,6 +455,95 @@ Namespace Winline Return Nothing End Function + Public Function GetDocuments(pMandator As Mandator, pDocumentType As DocumentType) As List(Of Document) + Try + Dim oYear As Integer = Config.GetWinLineYear() + Dim oDocumentType As Integer = pDocumentType + Dim oSql = $" + SELECT + c139 DOCUMENT_TYPE, + + c021 ACCOUNT_NUMBER, + c022 RUNNING_NUMBER, + + c043 OFFER_NUMBER, + c027 OFFER_DATE, + + c044 ORDER_NUMBER, + c028 ORDER_DATE, + + c045 DELIVERY_NUMBER, + c029 DELIVERY_DATE, + + c055 INVOICE_NUMBER, + c032 INVOICE_DATE, + + mesoyear + FROM [{pMandator.Database}].[dbo].[T025] + WHERE + c139 = {oDocumentType} AND + [mesocomp] = '{pMandator.Id}' AND [mesoyear] = {oYear}" + Dim oTable As DataTable = Database.GetDatatable(oSql) + Dim oDocuments As New List(Of Document) + + For Each oRow As DataRow In oTable.Rows + Try + Dim oDocument = GetDocumentFromDataRow(oRow) + oDocuments.Add(oDocument) + + Catch ex As Exception + Logger.Error(ex) + End Try + + Next + + Return oDocuments + + Catch ex As Exception + Logger.Warn("Error while loading documents for mandator [{0}] and document type [{1}]", pMandator, pDocumentType) + Logger.Error(ex) + Return Nothing + + End Try + End Function + + Private Function GetDocumentFromDataRow(pDataRow As DataRow) As Document + Dim oAccountNumber = pDataRow.Item("ACCOUNT_NUMBER") + Dim oRunningNumber As String = pDataRow.Item("RUNNING_NUMBER") + Dim oDocumentType As Integer = pDataRow.Item("DOCUMENT_TYPE") + Dim oDocumentNumber As String = Nothing + Dim oDocumentDate As Date = Nothing + + Dim oAccount = Accounts. + Where(Function(acc) acc.Id = oAccountNumber). + FirstOrDefault() + + Select Case oDocumentType + Case 1 + oDocumentNumber = pDataRow.Item("OFFER_NUMBER") + oDocumentDate = pDataRow.Item("OFFER_DATE") + Case 2 + oDocumentNumber = pDataRow.Item("ORDER_NUMBER") + oDocumentDate = pDataRow.Item("ORDER_DATE") + Case 3 + oDocumentNumber = pDataRow.Item("DELIVERY_NUMBER") + oDocumentDate = pDataRow.Item("DELIVERY_DATE") + Case 4 + oDocumentNumber = pDataRow.Item("INVOICE_NUMBER") + oDocumentDate = pDataRow.Item("INVOICE_DATE") + + End Select + + Dim oDocument As New Document With { + .Account = oAccount, + .RunningNumber = oRunningNumber, + .Number = oDocumentNumber, + .[Date] = oDocumentDate + } + + Return oDocument + End Function + ''' ''' Turns a database info like "SQLCWLDATEN on SERVER\INSTANCE" into a Tuple of two strings '''